Merge remote-tracking branch 'ryzomcore/atys' into feature/code-to-root-atys

.hgtags

@@ -1,27 +1,28 @@
-4eddbaff0c5e5d685db96ee3e8427aa0fd96ac83 v0.8.0
+4eddbaff0c5e5d685db96ee3e8427aa0fd96ac83 ryzomcore/v0.8.0
-00d9b6e29e95f56785fbf85abe60afd34674f402 v0.9.0
+00d9b6e29e95f56785fbf85abe60afd34674f402 ryzomcore/v0.9.0
-79776c337176dd5b02e1a74fe5dfb703b91747aa v0.9.1
+79776c337176dd5b02e1a74fe5dfb703b91747aa ryzomcore/v0.9.1
-fedf2aa443d09707beed814b0f499c6a5519cc84 v0.10.0
+fedf2aa443d09707beed814b0f499c6a5519cc84 ryzomcore/v0.10.0
-edaa3624a56420b02ccc64c26059801a389927ee v0.11.0
+edaa3624a56420b02ccc64c26059801a389927ee ryzomcore/v0.11.0
-e3fe4855f22c3e75722e015dc33c091c340b3ad7 v0.11.1
+e3fe4855f22c3e75722e015dc33c091c340b3ad7 ryzomcore/v0.11.1
-9e583b717fd63be0be9fd60b99087abf1691ea49 v0.11.2
+9e583b717fd63be0be9fd60b99087abf1691ea49 ryzomcore/v0.11.2
-bfe5628e14a024ba7ea32e4b326ae433a07856b9 v0.11.3
+bfe5628e14a024ba7ea32e4b326ae433a07856b9 ryzomcore/v0.11.3
-9a6120735daa97c96ac5d85ca35c7f21f607bd87 v0.12.0
+9a6120735daa97c96ac5d85ca35c7f21f607bd87 ryzomcore/v0.12.0
-3e92c7104c20d6bc6c2147b4b5fc289e8621d322 v1.0.0
+3e17907af67e8d66d80e6b714707bbf912607f2a ryzom-patch-3.0.0
-8eb94c3549be898fdc4a7c6d791d2477bdc11a18 v1.0.1
+153e0b605c9e0c83ba05b6428c62838b49cc84b2 ryzom-patch-3.0.1
-3e17907af67e8d66d80e6b714707bbf912607f2a ryzom/3.0.0
+9d41f2994d44b9aad92b83f945f114e4b6bed44a ryzom-patch-3.0.2
-153e0b605c9e0c83ba05b6428c62838b49cc84b2 ryzom/3.0.1
+4300cc14aad098b1f86ea4c55577b7fa4a4cb5d2 ryzom-patch-3.1.0
-9d41f2994d44b9aad92b83f945f114e4b6bed44a ryzom/3.0.2
+d4060f217f4f834cc62a33f2f1ccdf3c28298066 ryzom-patch-3.1.0-hotfix
-4300cc14aad098b1f86ea4c55577b7fa4a4cb5d2 ryzom/3.1.0
+043aaeb3d8a2a54177581b57bda87a9deaad510e ryzom-patch-3.1.0-april_patch
-d4060f217f4f834cc62a33f2f1ccdf3c28298066 ryzom/3.1.0-hotfix
+4036ecf59e83960f03acebc2089eb2ff5eeaed0a ryzom-patch-3.2.0
-043aaeb3d8a2a54177581b57bda87a9deaad510e ryzom/3.1.0-april_patch
+18403bb9485da3d9742c6f007a16d5619ebfb196 ryzom-patch-3.2.1
-4036ecf59e83960f03acebc2089eb2ff5eeaed0a ryzom/3.2.0
+822ff8f8917ad66e09e2c21c983282f6f693b9f6 ryzom-patch-3.3.0
-18403bb9485da3d9742c6f007a16d5619ebfb196 ryzom/3.2.1
+00dde390a394fce9da06c2f3264140282158d39f ryzom-patch-3.3.0
-822ff8f8917ad66e09e2c21c983282f6f693b9f6 ryzom/3.3.0
+dcd4c4d161ef775136e18c7e8f5072b75dede27e ryzom-patch-3.3.1
-00dde390a394fce9da06c2f3264140282158d39f ryzom/3.3.0
+fc4be8ebec5ca754ef4453bc6a9faef90837c674 ryzom-patch-3.4.0
-dcd4c4d161ef775136e18c7e8f5072b75dede27e ryzom/3.3.1
+70eba02e8eab6920586dbabf74e9e8180c729980 ryzom-patch-3.4.0 Steam Fix
-fc4be8ebec5ca754ef4453bc6a9faef90837c674 ryzom/3.4.0
+3941482843f9cd130cfc16634efc08d34a98ed35 ryzom-patch-3.4.0 Atysmas
-70eba02e8eab6920586dbabf74e9e8180c729980 ryzom/3.4.0-steam_fix
+ecae9feb4cceb78103e5d7236caccaf450796cdb ryzom-patch-3.5.0
-3941482843f9cd130cfc16634efc08d34a98ed35 ryzom/3.4.0-atysmas
+95783afa226f241062134eb62f4323295d29ac84 ryzom-patch-3.5.0.9637
-ecae9feb4cceb78103e5d7236caccaf450796cdb ryzom/3.5.0
+2102fb276eb69d49ed4923042215312a63c47c08 Live-746
-95783afa226f241062134eb62f4323295d29ac84 ryzom/3.5.0.9637
+8eb94c3549be898fdc4a7c6d791d2477bdc11a18 ryzomcore/v1.0.1
+3e92c7104c20d6bc6c2147b4b5fc289e8621d322 ryzomcore/v1.0.0

CMakeLists.txt

@@ -177,9 +177,16 @@ IF(WITH_STATIC)
     ENDIF()
 
     # under Linux and OS X, recent libxml2 versions are linked against libicu
-    FIND_PACKAGE(Icu)
+    # FIND_PACKAGE(Icu)
-    IF(ICU_LIBRARIES)
+    FIND_LIBRARY(ICU_LIBRARY icuuc)
-       SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${ICU_LIBRARIES} ${ICU_DATA_LIBRARIES})
+    IF(ICU_LIBRARY)
+       FIND_LIBRARY(ICU_DATA_LIBRARY icudata)
+       IF(ICU_LIBRARY)
+         MESSAGE(STATUS "ICU UC was found: ${ICU_LIBRARY}")
+       ELSE()
+         MESSAGE(STATUS "ICU UC was NOT found")
+       ENDIF()
+       SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${ICU_DATA_LIBRARY} ${ICU_LIBRARY})
     ENDIF()
 
   ENDIF()

nel/include/nel/gui/ctrl_scroll.h

@@ -177,6 +177,7 @@ namespace NLGUI
 		bool    _MouseDown  : 1;
 		bool	_CallingAH  : 1;
 		bool	_Cancelable : 1; // true if the slider may be cancelled when pressed on the mouse right button
+		bool	_Keyboard   : 1;
 		bool	_Frozen		: 1;
 		bool	_Scale		: 1;
 

nel/include/nel/gui/ctrl_text_button.h

@@ -127,6 +127,16 @@ namespace NLGUI
 		void setTexturePushed(const std::string &l, const std::string &m, const std::string &r);
 		void setTextureOver(const std::string &l, const std::string &m, const std::string &r);
 
+		// lua
+		void setTextureLua (const std::string &name);
+		void setTexturePushedLua (const std::string &name);
+		void setTextureOverLua (const std::string &name);
+
+		// return texture _l.tga
+		std::string getTexture () const;
+		std::string getTexturePushed () const;
+		std::string getTextureOver() const;
+
 		int luaGetViewText(CLuaState &ls);
 
 		REFLECT_EXPORT_START(CCtrlTextButton, CCtrlBaseButton)
@@ -137,6 +147,9 @@ namespace NLGUI
 			REFLECT_SINT32("wmin", getWMin, setWMin)
 			REFLECT_SINT32("hmin", getHMin, setHMin)
 			REFLECT_LUA_METHOD("getViewText", luaGetViewText)
+			REFLECT_STRING("texture", getTexture, setTextureLua);
+			REFLECT_STRING("texture_pushed", getTexturePushed, setTexturePushedLua);
+			REFLECT_STRING("texture_over", getTextureOver, setTextureOverLua);
 		REFLECT_EXPORT_END
 
 		void onRemoved();

nel/include/nel/gui/view_renderer.h

@@ -444,9 +444,13 @@ namespace NLGUI
 			SGlobalTexture ()
 			{
 				FromGlobaleTexture = true;
+				Scale = 1.f;
 			}
 			uint32				Width, Height;
 			uint32				DefaultWidth, DefaultHeight;
+			// used by texture atlas to unscale individual texture
+			// getTextureSizeFromId() calls to return 1x size for GUI.
+			float				Scale;
 			NL3D::UTexture		*Texture;
 			std::string			Name;
 			bool				FromGlobaleTexture;

nel/src/3d/driver/opengl/driver_opengl_extension.cpp

@@ -1584,6 +1584,14 @@ void	registerGlExtensions(CGlExtensions &ext)
 {
 	H_AUTO_OGL(registerGlExtensions);
 
+#ifdef NL_OS_MAC
+	CGLContextObj ctx = CGLGetCurrentContext();
+	if (ctx == NULL)
+	{
+		nlerror("No OpenGL context set");
+	}
+#endif
+
 	// OpenGL 1.2 ??
 	const char	*nglVersion = (const char *)glGetString (GL_VERSION);
 

nel/src/3d/driver/opengl/driver_opengl_window.cpp

@@ -1072,6 +1072,9 @@ bool CDriverGL::setDisplay(nlWindow wnd, const GfxMode &mode, bool show, bool re
 	[_ctx flushBuffer];
 	[_glView display];
 
+	// Set context as thread context
+	CGLSetCurrentContext((CGLContextObj)[_ctx CGLContextObj]);
+	
 	_EventEmitter.init(this, _glView, _DestroyWindow);
 
 #elif defined(NL_OS_UNIX)

nel/src/gui/ctrl_scroll.cpp

@@ -57,6 +57,7 @@ namespace NLGUI
 		_MouseDown = false;
 		_CallingAH = false;
 		_Cancelable = false;
+		_Keyboard = false;
 		_Target = NULL;
 		_Inverted = false;
 		_IsDBLink = false;
@@ -225,6 +226,11 @@ namespace NLGUI
 			return toString( _Cancelable );
 		}
 		else
+		if( name == "keyboard" )
+		{
+			return toString( _Keyboard );
+		}
+		else
 		if( name == "frozen" )
 		{
 			return toString( _Frozen );
@@ -405,6 +411,14 @@ namespace NLGUI
 			return;
 		}
 		else
+		if( name == "keyboard" )
+		{
+			bool b;
+			if( fromString( value, b ) )
+				_Keyboard = b;
+			return;
+		}
+		else
 		if( name == "frozen" )
 		{
 			bool b;
@@ -474,6 +488,7 @@ namespace NLGUI
 		xmlSetProp( node, BAD_CAST "target_stepy", BAD_CAST toString( _TargetStepY ).c_str() );
 		xmlSetProp( node, BAD_CAST "step_value", BAD_CAST toString( _StepValue ).c_str() );
 		xmlSetProp( node, BAD_CAST "cancelable", BAD_CAST toString( _Cancelable ).c_str() );
+		xmlSetProp( node, BAD_CAST "keyboard", BAD_CAST toString( _Keyboard ).c_str() );
 		xmlSetProp( node, BAD_CAST "frozen", BAD_CAST toString( _Frozen ).c_str() );
 
 		return node;
@@ -589,6 +604,9 @@ namespace NLGUI
 		prop = (char*) xmlGetProp( node, (xmlChar*)"cancelable" );
 		if (prop) _Cancelable = convertBool(prop);
 
+		prop = (char*) xmlGetProp( node, (xmlChar*)"keyboard" );
+		if (prop) _Keyboard = convertBool(prop);
+
 		prop= (char*) xmlGetProp (node, (xmlChar*)"frozen");
 		_Frozen = false;
 		if (prop)
@@ -854,6 +872,7 @@ namespace NLGUI
 		if (CCtrlBase::handleEvent(event)) return true;
 		if (!_Active || _Frozen)
 			return false;
+
 		if (event.getType() == NLGUI::CEventDescriptor::mouse)
 		{
 			const NLGUI::CEventDescriptorMouse &eventDesc = (const NLGUI::CEventDescriptorMouse &)event;
@@ -912,6 +931,30 @@ namespace NLGUI
 				return true;
 			}
 		}
+		else if (event.getType() == NLGUI::CEventDescriptor::key)
+		{
+			const NLGUI::CEventDescriptorKey &eventDesc = (const NLGUI::CEventDescriptorKey &)event;
+
+			if (eventDesc.getKeyEventType() == NLGUI::CEventDescriptorKey::keydown)
+			{
+				if (_Keyboard)
+				{
+					sint32 i = 0;
+					// direction
+					if (eventDesc.getKey() == KeyNEXT)  i++;
+					else if (eventDesc.getKey() == KeyPRIOR) i--;
+					else
+						return false;
+
+					if (_Vertical)
+						moveTrackY(-(i * _TargetStepY));
+					else
+						moveTrackX(-(i * _TargetStepX));
+
+					return true;
+				}
+			}
+		}
 		return false;
 	}
 
@@ -1213,6 +1256,7 @@ namespace NLGUI
 		if(wReal <= maxWReal)
 			return;
 
+
 		// compute the new ofsX.
 		sint32	ofsX= _Target->getOfsX();
 		ofsX+= dx;

nel/src/gui/ctrl_text_button.cpp

@@ -1077,6 +1077,69 @@ namespace NLGUI
 
 	// ***************************************************************************
 
+	void CCtrlTextButton::setTextureLua(const std::string &name)
+	{
+		_TextureIdNormal[0].setTexture(std::string(name + "_l.tga").c_str());
+		_TextureIdNormal[1].setTexture(std::string(name + "_m.tga").c_str());
+		_TextureIdNormal[2].setTexture(std::string(name + "_r.tga").c_str());
+	}
+
+	// ***************************************************************************
+
+	void CCtrlTextButton::setTexturePushedLua(const std::string &name)
+	{
+		_TextureIdPushed[0].setTexture(std::string(name + "_l.tga").c_str());
+		_TextureIdPushed[1].setTexture(std::string(name + "_m.tga").c_str());
+		_TextureIdPushed[2].setTexture(std::string(name + "_r.tga").c_str());
+	}
+
+	// ***************************************************************************
+
+	void CCtrlTextButton::setTextureOverLua(const std::string &name)
+	{
+		_TextureIdOver[0].setTexture(std::string(name + "_l.tga").c_str());
+		_TextureIdOver[1].setTexture(std::string(name + "_m.tga").c_str());
+		_TextureIdOver[2].setTexture(std::string(name + "_r.tga").c_str());
+	}
+
+	// ***************************************************************************
+
+	std::string CCtrlTextButton::getTexture() const
+	{
+		std::string tx = CViewRenderer::getInstance()->getTextureNameFromId(_TextureIdNormal[0]);
+		std::string::size_type i = tx.rfind("_l.tga");
+		if (i != std::string::npos)
+			tx = tx.substr(0, i);
+
+		return tx;
+	}
+
+	// ***************************************************************************
+
+	std::string CCtrlTextButton::getTexturePushed() const
+	{
+		std::string tx = CViewRenderer::getInstance()->getTextureNameFromId(_TextureIdOver[0]);
+		std::string::size_type i = tx.rfind("_l.tga");
+		if (i != std::string::npos)
+			tx = tx.substr(0, i);
+
+		return tx;
+	}
+
+	// ***************************************************************************
+
+	std::string CCtrlTextButton::getTextureOver() const
+	{
+		std::string tx = CViewRenderer::getInstance()->getTextureNameFromId(_TextureIdPushed[0]);
+		std::string::size_type i = tx.rfind("_l.tga");
+		if (i != std::string::npos)
+			tx = tx.substr(0, i);
+
+		return tx;
+	}
+
+	// ***************************************************************************
+
 	int CCtrlTextButton::luaGetViewText(CLuaState &ls)
 	{
 		const char *funcName = "getViewText";

nel/src/gui/view_renderer.cpp

@@ -621,9 +621,7 @@ namespace NLGUI
 			return;
 
 		sint32 txw, txh;
-		SImage &rImage = *getSImage(nTxId);
+		getTextureSizeFromId(nTxId, txw, txh);
-		txw = (sint32)((rImage.UVMax.U - rImage.UVMin.U)*rImage.GlobalTexturePtr->Width+0.5f);
-		txh = (sint32)((rImage.UVMax.V - rImage.UVMin.V)*rImage.GlobalTexturePtr->Height+0.5f);
 
 		drawRotFlipBitmap (layerId, x, y, txw, txh, rot, flipv, nTxId, col);
 	}
@@ -859,6 +857,14 @@ namespace NLGUI
 		CIFile ifTmp;
 		if (ifTmp.open(filename))
 			CBitmap::loadSize (ifTmp, gt.Width, gt.Height);
+
+		// extract textures scale from filename
+		// texture_interface_v3_2x.tga / texture_interface_v3_4x.tga
+		if (textureFileName.find("_2x.") != std::string::npos)
+			gt.Scale = 2.f;
+		else if (textureFileName.find("_4x.") != std::string::npos)
+			gt.Scale = 4.f;
+
 		gt.Texture = driver->createTextureFile (filename);
 		// Force to generate the texture now. This way we can extract the mouse bitmaps from it now without having to load it again.
 		// Its why we don't release it at the end, because it is likely to be uploaded soon)
@@ -932,6 +938,10 @@ namespace NLGUI
 						CBitmap curs;
 						curs.resize(x1 - x0, y1 - y0);
 						curs.blit(*texDatas, x0, y0, (x1 - x0), (y1 - y0), 0, 0);
+						// TODO: scaled cursors not supported
+						if (gt.Scale > 1.f) {
+							curs.resample((sint)(curs.getWidth() / gt.Scale), (sint)(curs.getHeight() / gt.Scale));
+						}
 						driver->addCursor(image.Name, curs);
 					}
 				}
@@ -1357,8 +1367,8 @@ namespace NLGUI
 		else
 		{
 			SImage &rImage = *getSImage(id);
-			width = (sint32)((rImage.UVMax.U - rImage.UVMin.U)*rImage.GlobalTexturePtr->Width+0.5f);
+			width = (sint32)(((rImage.UVMax.U - rImage.UVMin.U)*rImage.GlobalTexturePtr->Width / rImage.GlobalTexturePtr->Scale)+0.5f);
-			height = (sint32)((rImage.UVMax.V - rImage.UVMin.V)*rImage.GlobalTexturePtr->Height+0.5f);
+			height = (sint32)(((rImage.UVMax.V - rImage.UVMin.V)*rImage.GlobalTexturePtr->Height / rImage.GlobalTexturePtr->Scale)+0.5f);
 		}
 	}
 	/*
@@ -1373,9 +1383,11 @@ namespace NLGUI
 
 		SImage &rImage = *getSImage(id);
 		SGlobalTexture &rGT = *rImage.GlobalTexturePtr;
+		// get (possibly) scaled width/height
 		sint32 width, height;
-		width = (sint32)((rImage.UVMax.U - rImage.UVMin.U)*rGT.Width+0.5f);
+		getTextureSizeFromId(id, width, height);
-		height = (sint32)((rImage.UVMax.V - rImage.UVMin.V)*rGT.Height+0.5f);
+		if (width == 0 || height == 0)
+			return CRGBA(255,255,255);
 		float xRatio = ((float)x) / ((float)(width));
 		float yRatio = ((float)y) / ((float)(height));
 		UTexture *pTF = rGT.Texture;

nel/src/gui/widget_manager.cpp

@@ -2296,7 +2296,7 @@ namespace NLGUI
 		// Hide menu if the key is pushed
 //		if ((eventDesc.getKeyEventType() == CEventDescriptorKey::keydown) && !_ModalStack.empty() && !eventDesc.getKeyAlt() && !eventDesc.getKeyCtrl() && !eventDesc.getKeyShift())
 		// Hide menu (or popup menu) is ESCAPE pressed
-		if( eventDesc.getKeyEventType() == CEventDescriptorKey::keychar && eventDesc.getChar() == NLMISC::KeyESCAPE )
+		if( eventDesc.getKeyEventType() == CEventDescriptorKey::keydown && eventDesc.getKey() == NLMISC::KeyESCAPE )
 		{
 			if( hasModal() )
 			{
@@ -2307,7 +2307,7 @@ namespace NLGUI
 		}
 
 		// Manage "quit window" If the Key is ESCAPE, no captureKeyboard
-		if( eventDesc.getKeyEventType() == CEventDescriptorKey::keychar && eventDesc.getChar() == NLMISC::KeyESCAPE )
+		if( eventDesc.getKeyEventType() == CEventDescriptorKey::keydown && eventDesc.getKey() == NLMISC::KeyESCAPE )
 		{
 			// Get the last escapable active top window. NB: this is ergonomically better.
 			CInterfaceGroup	*win= getLastEscapableTopWindow();

ryzom/client/CMakeLists.txt

@@ -8,7 +8,7 @@ IF(WITH_RYZOM_CLIENT)
     ADD_SUBDIRECTORY(unix)
   ENDIF()
 
-  INSTALL(FILES client_default.cfg DESTINATION ${RYZOM_ETC_PREFIX})
+  #INSTALL(FILES client_default.cfg DESTINATION ${RYZOM_ETC_PREFIX})
 
   IF(WITH_RYZOM_PATCH)
     IF(APPLE)

ryzom/client/src/CMakeLists.txt

@@ -82,7 +82,7 @@ IF(WITH_RYZOM_CLIENT)
     ADD_CUSTOM_COMMAND(TARGET ryzom_client PRE_BUILD COMMAND mkdir -p ${RYZOM_RESOURCES_DIR})
     ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -p ${MAC_RESOURCES_DIR}/PkgInfo ${RYZOM_CONTENTS_DIR})
     ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -p ${MAC_RESOURCES_DIR}/ryzom.icns ${RYZOM_RESOURCES_DIR})
-    ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -p ${CMAKE_SOURCE_DIR}/ryzom/client/client_default.cfg ${RYZOM_RESOURCES_DIR})
+    #ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -p ${CMAKE_SOURCE_DIR}/ryzom/client/client_default.cfg ${RYZOM_RESOURCES_DIR})
 
     # remove any present installscript_osx.vdf before signing
     ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND rm -f ${RYZOM_OUTPUT_DIR}/installscript_osx.vdf)

ryzom/client/src/client_cfg.cpp

@@ -439,8 +439,8 @@ CClientConfig::CClientConfig()
 	CurlMaxConnections = 5;
 	CurlCABundle.clear();
 
-	RingReleaseNotePath = WebIgMainDomain + "/releasenotes_ring/index.php";
+	RingReleaseNotePath = WebIgMainDomain + "/app_releasenotes/index.php";
-	ReleaseNotePath = WebIgMainDomain + "/releasenotes/index.php";
+	ReleaseNotePath = WebIgMainDomain + "/app_releasenotes/index.php";
 
 
 	///////////////

ryzom/client/src/connection.cpp

@@ -33,6 +33,7 @@
 #include "nel/misc/time_nl.h"
 #include "nel/misc/algo.h"
 #include "nel/misc/system_utils.h"
+#include "nel/misc/stream.h"
 // 3D Interface.
 #include "nel/3d/u_driver.h"
 #include "nel/3d/u_text_context.h"
@@ -149,6 +150,7 @@ ucstring	PlayerSelectedHomeShardName;
 ucstring	PlayerSelectedHomeShardNameWithParenthesis;
 extern std::string CurrentCookie;
 
+
 ucstring NewKeysCharNameWanted; // name of the character for which a new keyset must be created
 ucstring NewKeysCharNameValidated;
 std::string GameKeySet = "keys.xml";
@@ -157,9 +159,11 @@ std::string RingEditorKeySet = "keys_r2ed.xml";
 string		ScenarioFileName;
 sint 		LoginCharsel = -1;
 
-static const char *KeySetVarName = "BuiltInKeySets";
+std::string ImportCharacter;
 
+static const char *KeySetVarName = "BuiltInKeySets";
 
+#define GROUP_LIST_CHARACTER            "ui:outgame:charsel_import:import_list"
 #define	GROUP_LIST_MAINLAND				"ui:outgame:appear_mainland:mainland_list"
 #define	GROUP_LIST_KEYSET				"ui:outgame:appear_keyset:keyset_list"
 vector<CMainlandSummary>	Mainlands;
@@ -2139,7 +2143,7 @@ public:
 
 	virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */)
 	{
-		CInterfaceManager *pIM = CInterfaceManager::getInstance();
+		//CInterfaceManager *pIM = CInterfaceManager::getInstance();
 
 		CInterfaceGroup *pList = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_MAINLAND));
 		if (pList == NULL)
@@ -2218,7 +2222,7 @@ public:
 
 	virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */)
 	{
-		CInterfaceManager *pIM = CInterfaceManager::getInstance();
+		//CInterfaceManager *pIM = CInterfaceManager::getInstance();
 		CInterfaceGroup *pList = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_MAINLAND));
 		pList->clearGroups();
 	}
@@ -2229,32 +2233,56 @@ REGISTER_ACTION_HANDLER (CAHResetMainlandList, "reset_mainland_list");
 // ***************************************************************************
 class CAHMainlandSelect : public IActionHandler
 {
-	virtual void execute (CCtrlBase *pCaller, const string &/* Params */)
+	virtual void execute (CCtrlBase *pCaller, const std::string &Params)
 	{
-		nlinfo("CAHMainlandSelect called");
+		//nlinfo("CAHMainlandSelect called");
-
+		struct CUnpush : public CInterfaceElementVisitor
-		CInterfaceManager *pIM = CInterfaceManager::getInstance();
+		{
+			CCtrlBase *Ref;
+			virtual void visitCtrl(CCtrlBase *ctrl)
+			{
+				if (ctrl == Ref) return;
+				CCtrlBaseButton *but = dynamic_cast<CCtrlBaseButton*>(ctrl);
+				if (but)
+				{
+					but->setPushed(false);
+				}
+			}
+		};
+		CInterfaceGroup *list = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_MAINLAND));
+		if (!list)
+			return;
 
-		CCtrlButton *pCB = NULL;
+		// unselect
-		// Unselect
+		if (Params.empty())
-		if (MainlandSelected.asInt() != 0)
 		{
-			pCB = dynamic_cast<CCtrlButton*>(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_MAINLAND ":"+toString(MainlandSelected)+":but"));
+			CUnpush unpusher;
-			if (pCB != NULL)
+			unpusher.Ref = pCaller;
-				pCB->setPushed(false);
+			list->visit(&unpusher);
 		}
 
-		pCB = dynamic_cast<CCtrlButton*>(pCaller);
+		// now select
-		if (pCB != NULL)
+		uint32 mainland;
+		if (Params.empty())
 		{
-			string name = pCB->getId();
+			CCtrlButton *pCB = dynamic_cast<CCtrlButton*>(pCaller);
+			if (!pCB)
+				return;
+
+			std::string name = pCB->getId();
 			name = name.substr(0, name.rfind(':'));
-			uint32 mainland;
+
-			fromString(name.substr(name.rfind(':')+1,name.size()), mainland);
+			if (!fromString(name.substr(name.rfind(':')+1, name.size()), mainland))
-			MainlandSelected = (TSessionId)mainland;
+				return;
 
 			pCB->setPushed(true);
 		}
+		else
+			if (!fromString(Params, mainland))
+				return;
+
+		// and store
+		MainlandSelected = (TSessionId)mainland;
 	}
 };
 REGISTER_ACTION_HANDLER (CAHMainlandSelect, "mainland_select");
@@ -2459,7 +2487,7 @@ public:
 
 	virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */)
 	{
-		CInterfaceManager *pIM = CInterfaceManager::getInstance();
+		//CInterfaceManager *pIM = CInterfaceManager::getInstance();
 		CInterfaceGroup *pList = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_KEYSET));
 		pList->clearGroups();
 	}
@@ -2470,21 +2498,18 @@ REGISTER_ACTION_HANDLER (CAHResetKeysetList, "reset_keyset_list");
 // ***************************************************************************
 class CAHResetKeysetSelect : public IActionHandler
 {
-public:
 	std::string getIdPostFix(const std::string fullId)
 	{
 		std::string::size_type pos = fullId.find_last_of(":");
 		if (pos != std::string::npos)
-		{
 			return fullId.substr(pos + 1);
-		}
+
 		return "";
 	}
-	virtual void execute (CCtrlBase *pCaller, const string &/* Params */)
+
+	virtual void execute(CCtrlBase *pCaller, const std::string &Params)
 	{
-		if (!pCaller) return;
 		// 'unpush' all groups but the caller
-		//
 		struct CUnpush : public CInterfaceElementVisitor
 		{
 			CCtrlBase *Ref;
@@ -2498,31 +2523,41 @@ public:
 				}
 			}
 		};
-		CInterfaceManager *pIM = CInterfaceManager::getInstance();
 		CInterfaceGroup *list = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_KEYSET));
-		if (list)
+		if (!list)
-		{
+			return;
+
+		// unselect
 		CUnpush unpusher;
 		unpusher.Ref = pCaller;
 		list->visit(&unpusher);
-		}
+
+		// now select
 		CCtrlBaseButton *but = dynamic_cast<CCtrlBaseButton*>(pCaller);
 		if (but)
-		{
 			but->setPushed(true);
+
+		std::string id;
+		if (Params.empty())
+		{
+			if (!pCaller) return;
+			if (!pCaller->getParent()) return;
+
+			id = getIdPostFix(pCaller->getParent()->getId());
 		}
-		//
+		else
+			id = getIdPostFix(Params);
+
 		GameKeySet = "keys.xml";
 		RingEditorKeySet = "keys_r2ed.xml";
-		if (!pCaller->getParent()) return;
+
-		// compute the 2 filenames from the id
+		// compute the two filenames from the id
-		// if id is in the built-in keysets :
+		// if id is in the built-in keysets
 		CConfigFile::CVar *keySetVar = ClientCfg.ConfigFile.getVarPtr(KeySetVarName);
-		if (keySetVar && keySetVar->size() != 0)
+		if (keySetVar && keySetVar->size() > 0)
 		{
 			for (uint k = 0; k < keySetVar->size(); ++k)
 			{
-				std::string id = getIdPostFix(pCaller->getParent()->getId());
 				if (keySetVar->asString(k) == id)
 				{
 					GameKeySet = "keys" + string(id.empty() ? "" : "_") + id + ".xml";
@@ -2531,17 +2566,15 @@ public:
 				}
 			}
 		}
-		// ... else maybe from a previous character	?
-		if (CFile::isExists("save/keys_" + getIdPostFix(pCaller->getParent()->getId()) + ".xml") )
-		{
-			GameKeySet = "keys_" + getIdPostFix(pCaller->getParent()->getId()) + ".xml";
-		}
-		if (CFile::isExists("save/keys_r2ed_" + getIdPostFix(pCaller->getParent()->getId()) + ".xml") )
-		{
-			RingEditorKeySet = "keys_r2ed_" + getIdPostFix(pCaller->getParent()->getId()) + ".xml";
-		}
-		// NB : key file will be copied for real when the new 'character summary' is
 
+		// else maybe from a previous character?
+		if (CFile::isExists("save/keys_" + id + ".xml"))
+			GameKeySet = "keys_" + id + ".xml";
+
+		if (CFile::isExists("save/keys_r2ed_" + id + ".xml"))
+			RingEditorKeySet = "keys_r2ed_" + id + ".xml";
+
+		// NB: key file will be copied for real when the new character summary is
 	}
 };
 REGISTER_ACTION_HANDLER (CAHResetKeysetSelect, "keyset_select");
@@ -3436,3 +3469,239 @@ class CAHOpenRingSessions : public IActionHandler
 	}
 };
 REGISTER_ACTION_HANDLER (CAHOpenRingSessions, "open_ring_sessions");
+
+// ***************************************************************************
+class CAHInitImportCharacter : public IActionHandler
+{
+	virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */)
+	{
+		CInterfaceGroup *list = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_CHARACTER));
+		if (!list)
+		{
+			nlwarning("element " GROUP_LIST_CHARACTER " not found probably bad outgame.xml");
+			return;
+		}
+
+		// retrieve saved files
+		std::vector<string> savedCharacters;
+		CPath::getPathContent("save/", false, false, true, savedCharacters);
+
+		CInterfaceGroup *newLine;
+		CInterfaceGroup *prevLine;
+
+		for (uint i = 0; i < savedCharacters.size(); ++i)
+		{
+			// search saved characters only
+			if (testWildCard(CFile::getFilename(savedCharacters[i]), "character_*.save"))
+			{
+				const std::string id = CFile::getFilenameWithoutExtension(savedCharacters[i]).substr(strlen("character_"));
+				if (id.empty())
+					continue;
+
+				std::vector<pair<string, string>> params;
+				params.clear();
+				params.push_back(std::pair<string, string>("id", id));
+				// adjust ref
+				if (list->getNumGroup() > 0)
+					params.push_back(std::pair<string, string>("posref", "BL TL"));
+
+				newLine = CWidgetManager::getInstance()->getParser()->createGroupInstance("t_import", GROUP_LIST_CHARACTER, params);
+				if (newLine)
+				{
+					CViewText *text = dynamic_cast<CViewText*>(newLine->getView("name"));
+					if (text)
+						text->setText(ucstring(savedCharacters[i]));
+
+					// first button is pushed
+					CCtrlButton *button = dynamic_cast<CCtrlButton*>(newLine->getCtrl("but"));
+					if (button && list->getNumGroup() == 0)
+						button->setPushed(true);
+
+					// add to the list now
+					newLine->setParent(list);
+					newLine->setParentSize(list);
+					newLine->setParentPos(prevLine);
+
+					list->addGroup(newLine);
+
+					prevLine = newLine;
+				}
+			}
+		}
+		// none case
+		if (list->getNumGroup() == 0)
+			CLuaManager::getInstance().executeLuaScript("outgame:procCharselNotifaction(3)");
+
+		list->invalidateCoords();
+	}
+};
+REGISTER_ACTION_HANDLER( CAHInitImportCharacter, "import_char_init" );
+
+// ***************************************************************************
+class CAHResetImportCharacter : public IActionHandler
+{
+	virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */)
+	{
+		CInterfaceGroup *list = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_CHARACTER));
+		if (list)
+			list->clearGroups();
+
+		if (!ImportCharacter.empty())
+			ImportCharacter = "";
+	}
+};
+REGISTER_ACTION_HANDLER( CAHResetImportCharacter, "import_char_reset" );
+
+// ***************************************************************************
+class CAHSelectImportCharacter : public IActionHandler
+{
+	virtual void execute (CCtrlBase *pCaller, const std::string &Params)
+	{
+		struct CUnpush : public CInterfaceElementVisitor
+		{
+			CCtrlBase *Ref;
+			virtual void visitCtrl(CCtrlBase *ctrl)
+			{
+				if (ctrl == Ref) return;
+				CCtrlBaseButton *but = dynamic_cast<CCtrlBaseButton*>(ctrl);
+				if (but)
+				{
+					but->setPushed(false);
+				}
+			}
+		};
+		CInterfaceGroup *list = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_CHARACTER));
+		if (!list)
+			return;
+
+		// unselect
+		if (Params.empty())
+		{
+			CUnpush unpusher;
+			unpusher.Ref = pCaller;
+			list->visit(&unpusher);
+		}
+
+		// now select
+		std::string name;
+		if (Params.empty())
+		{
+			CCtrlButton *pCB = dynamic_cast<CCtrlButton*>(pCaller);
+			if (!pCB)
+				return;
+
+			std::string id = pCB->getId();
+			id = id.substr(0, id.rfind(':'));
+
+			if (!fromString(id.substr(id.rfind(':')+1, id.size()), name))
+				return;
+
+			pCB->setPushed(true);
+		}
+		else
+			if (!fromString(Params, name))
+				return;
+
+		ImportCharacter = "";
+		// check filename and store
+		if (CFile::fileExists(toString("save/character_%s.save", name.c_str())))
+			ImportCharacter = name;
+	}
+};
+REGISTER_ACTION_HANDLER( CAHSelectImportCharacter, "import_char_select" );
+
+// ***************************************************************************
+class CAHImportCharacter : public IActionHandler
+{
+	virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */)
+	{
+		if (ImportCharacter.empty())
+			return;
+
+		if (!CFile::fileExists(toString("save/character_%s.save", ImportCharacter.c_str())))
+			return;
+
+		bool success = false;
+
+		CIFile fd;
+		CCharacterSummary CS;
+		// use temporary file until close()
+		if (fd.open(toString("save/character_%s.save", ImportCharacter.c_str())))
+		{
+			try
+			{
+				CS.serial(fd);
+				SCharacter3DSetup::setupDBFromCharacterSummary("UI:TEMP:CHAR3D", CS);
+
+				// validate import
+				CDBManager::getInstance()->getDbProp("UI:TEMP:IMPORT")->setValue32(1);
+				success = true;
+			}
+			catch (const EStream &e)
+			{
+				nlwarning(e.what());
+			}
+			fd.close();
+		}
+		else
+			nlwarning("Failed to open file: save/character_%s.save", ImportCharacter.c_str());
+
+		// user notification
+		if (!success)
+			CLuaManager::getInstance().executeLuaScript("outgame:procCharselNotifaction(2)");
+		else
+			CAHManager::getInstance()->runActionHandler("proc", NULL, "proc_charsel_create_new");
+	}
+};
+REGISTER_ACTION_HANDLER( CAHImportCharacter, "import_char" );
+
+// ***************************************************************************
+class CAHExportCharacter : public IActionHandler
+{
+	virtual void execute (CCtrlBase * /* pCaller */, const std::string &Params)
+	{
+		if (Params.empty())
+			return;
+
+		sint32 slot = -1;
+		if (!fromString(getParam(Params, "slot"), slot))
+			return;
+
+		if (slot >= CharacterSummaries.size() || slot < 0)
+			return;
+
+		// retrieve infos
+		CCharacterSummary &CS = CharacterSummaries[slot];
+		if (CS.Name.empty())
+			return;
+
+		// extract name
+		const std::string name = buildPlayerNameForSaveFile(CS.Name.toString());
+
+		COFile fd;
+		bool success = false;
+		// use temporary file until close()
+		if (fd.open(toString("save/character_%s.save", name.c_str()), false, false, true))
+		{
+			try
+			{
+				fd.serial(CS);
+				fd.flush();
+				// validate
+				success = true;
+			}
+			catch (const EStream &e)
+			{
+				nlwarning(e.what());
+			}
+			fd.close();
+		}
+		else
+			nlwarning("Failed to open file: save/character_%s.save", name.c_str());
+
+		const uint8 val = (success == true) ? 0 : 1;
+		// user notification
+		CLuaManager::getInstance().executeLuaScript(toString("outgame:procCharselNotifaction(%i)", val));
+	}
+};
+REGISTER_ACTION_HANDLER( CAHExportCharacter, "export_char" );

ryzom/client/src/events_listener.cpp

@@ -172,16 +172,12 @@ void CEventsListener::operator()(const CEvent& event)
 			// Get in pixel space, centered
 			uint32 drW, drH;
 			Driver->getWindowSize(drW, drH);
-			float fX = mouseEvent->X; // from 0 to 1.0
+			sint scX = (sint32)(mouseEvent->X * (float)drW) - ((sint32)drW >> 1); // in pixels, centered
-			float fY = (ClientCfg.FreeLookInverted ? -mouseEvent->Y : mouseEvent->Y);
+			sint scY = (sint32)(mouseEvent->Y * (float)drH) - ((sint32)drH >> 1);
-			sint scX = (sint32)(fX * (float)drW) - ((sint32)drW >> 1); // in pixels, centered
-			sint scY = (sint32)(fY * (float)drH) - ((sint32)drH >> 1);
 			if (!s_MouseFreeLookReady)
 			{
-				float pfX = _MouseX;
+				sint pscX = (sint32)(_MouseX * (float)drW) - ((sint32)drW >> 1); // in pixels, centered
-				float pfY = (ClientCfg.FreeLookInverted ? -_MouseY : _MouseY);
+				sint pscY = (sint32)(_MouseY * (float)drH) - ((sint32)drH >> 1);
-				sint pscX = (sint32)(pfX * (float)drW) - ((sint32)drW >> 1); // in pixels, centered
-				sint pscY = (sint32)(pfY * (float)drH) - ((sint32)drH >> 1);
 				s_MouseFreeLookReady = true;
 				s_MouseFreeLookLastX = pscX;
 				s_MouseFreeLookLastY = pscY;
@@ -199,13 +195,12 @@ void CEventsListener::operator()(const CEvent& event)
 			}
 
 			// Get delta since last center
-			sint scXd = scX - s_MouseFreeLookLastX;
+			s_MouseFreeLookFrameX += (scX - s_MouseFreeLookLastX);
-			sint scYd = scY - s_MouseFreeLookLastY;
+			s_MouseFreeLookFrameY += (scY - s_MouseFreeLookLastY) * (ClientCfg.FreeLookInverted ? -1 : 1);
+
 			s_MouseFreeLookLastX = scX;
 			s_MouseFreeLookLastY = scY;
 
-			s_MouseFreeLookFrameX += scXd;
-			s_MouseFreeLookFrameY += scYd;
 			// updateFreeLookPos is called in updateMouseSmoothing per frame
 
 			// Center cursor

ryzom/client/src/game_context_menu.cpp

@@ -458,11 +458,12 @@ void		CGameContextMenu::update()
 		if (pLeafFame != NULL)
 			fameValue = pLeafFame->getValue8();
 	}
+
 	if (_TextNews)
-		_TextNews->setActive(selection && !canAttack() && selection->isNPC() && fameValue >= -30);
+		_TextNews->setActive(!UserEntity->isFighting() && !UserEntity->isRiding() && selection && !canAttack() && selection->isNPC() && fameValue >= -30);
 
 	if (_TextNewsAgressive)
-		_TextNewsAgressive->setActive(selection && !canAttack() && selection->isNPC() && fameValue < -30);
+		_TextNewsAgressive->setActive(!UserEntity->isFighting() && !UserEntity->isRiding() && selection && !canAttack() && selection->isNPC() && fameValue < -30);
 
 
 	if (_TextDuel && _TextUnDuel)

ryzom/client/src/interface_v3/action_handler_game.cpp

@@ -4655,6 +4655,45 @@ public:
 };
 REGISTER_ACTION_HANDLER( CHandlerSortTribeFame, "sort_tribefame");
 
+// ***************************************************************************
+class CHandlerOutgameNaviGetKeys : public IActionHandler
+{
+	virtual void execute (CCtrlBase *pCaller, const std::string &Params)
+	{
+		if (!pCaller->getParent())
+			return;
+
+		if (pCaller->getParent()->getId() != "ui:outgame")
+			return;
+
+		if (Params.empty())
+		{
+			sint32 event = -1;
+
+			if (Driver->AsyncListener.isKeyPushed(KeyESCAPE)) event = 0;
+			if (Driver->AsyncListener.isKeyPushed(KeyDELETE)) event = 1;
+			if (Driver->AsyncListener.isKeyPushed(KeyRETURN)) event = 2;
+			if (Driver->AsyncListener.isKeyPushed(KeyDOWN))   event = 3;
+			if (Driver->AsyncListener.isKeyPushed(KeyUP))     event = 4;
+			if (Driver->AsyncListener.isKeyPushed(KeyI))      event = 5;
+			if (Driver->AsyncListener.isKeyPushed(KeyP))      event = 6;
+			if (Driver->AsyncListener.isKeyPushed(KeyE))      event = 7;
+			if (Driver->AsyncListener.isKeyPushed(KeyLEFT))   event = 8;
+			if (Driver->AsyncListener.isKeyPushed(KeyRIGHT))  event = 9;
+
+			std::string id = "create";
+			if (pCaller->getId() == "ui:outgame:charsel")
+				id = "sel";
+
+			if (event != -1)
+-				CLuaManager::getInstance().executeLuaScript(toString("outgame:eventChar%sKeyGet(%i)", id.c_str(), event));
+		}
+		// reset previous input
+		Driver->AsyncListener.reset();
+	}
+};
+REGISTER_ACTION_HANDLER( CHandlerOutgameNaviGetKeys, "navigate_outgame" );
+
 // ***************************************************************************
 class CHandlerTriggerIconBuffs : public IActionHandler
 {

ryzom/client/src/interface_v3/action_handler_phrase.cpp

@@ -136,7 +136,7 @@ public:
 				if (pCSDst->isShortCut())
 					pPM->CompositionPhraseMemoryLineDest= pPM->getSelectedMemoryLineDB();
 				else
-					pPM->CompositionPhraseMemoryLineDest= 0;
+				        pPM->CompositionPhraseMemoryLineDest= pPM->getSelectedMemoryAltLineDB();
 
 				pPM->CompositionPhraseMemorySlotDest= pCSDst->getIndexInDB();
 			}
@@ -750,8 +750,8 @@ class CHandlerMemorizePhraseOrMacro : public IActionHandler
 {
 public:
 	virtual void execute (CCtrlBase *pCaller, const string &Params);
-	void memorizePhraseOrMacro(uint dstMemoryIndex, bool isMacro, sint32 phraseId, sint32 macroId);
+        void memorizePhraseOrMacro(sint32 memoryLine, uint dstMemoryIndex, bool isMacro, sint32 phraseId, sint32 macroId);
-	void memorizePhraseSheet(uint dstMemoryIndex, uint32 sheetId);
+        void memorizePhraseSheet(sint32 memoryLine, uint dstMemoryIndex, uint32 sheetId);
 };
 REGISTER_ACTION_HANDLER( CHandlerMemorizePhraseOrMacro, "memorize_phrase_or_macro");
 
@@ -771,7 +771,11 @@ void CHandlerMemorizePhraseOrMacro::execute (CCtrlBase *pCaller, const string &P
 	// The dest must be a memory or a macro memory
 	if (!pCSDst->isSPhraseIdMemory() && !pCSDst->isMacroMemory())	return;
 	// get the memory line and memory index
-	sint32	dstMemoryLine= pPM->getSelectedMemoryLineDB();
+	sint32	dstMemoryLine;
+	if (pCSDst->isShortCut())
+	        dstMemoryLine = pPM->getSelectedMemoryLineDB();
+	else
+	        dstMemoryLine = pPM->getSelectedMemoryAltLineDB();
 	uint	dstMemoryIndex= pCSDst->getIndexInDB();
 
 	bool	srcIsMacro;
@@ -806,7 +810,7 @@ void CHandlerMemorizePhraseOrMacro::execute (CCtrlBase *pCaller, const string &P
 			pPM->sendLearnToServer(newPhraseId);
 
 			// memorize the new phrase
-			memorizePhraseOrMacro(dstMemoryIndex, srcIsMacro, newPhraseId, srcMacroId);
+			memorizePhraseOrMacro(dstMemoryLine, dstMemoryIndex, srcIsMacro, newPhraseId, srcMacroId);
 		}
 	}
 	else
@@ -833,7 +837,7 @@ void CHandlerMemorizePhraseOrMacro::execute (CCtrlBase *pCaller, const string &P
 			if(pCSSrc->isSPhrase())
 			{
 				// learn and memorize this phrase
-				memorizePhraseSheet(dstMemoryIndex, pCSSrc->getSheetId());
+			        memorizePhraseSheet(dstMemoryLine, dstMemoryIndex, pCSSrc->getSheetId());
 			}
 			else
 			{
@@ -842,7 +846,7 @@ void CHandlerMemorizePhraseOrMacro::execute (CCtrlBase *pCaller, const string &P
 					pPM->fullDeletePhraseIfLast(dstMemoryLine, dstMemoryIndex);
 
 				// memorize the phrase or macro
-				memorizePhraseOrMacro(dstMemoryIndex, srcIsMacro, srcPhraseId, srcMacroId);
+				memorizePhraseOrMacro(dstMemoryLine, dstMemoryIndex, srcIsMacro, srcPhraseId, srcMacroId);
 			}
 		}
 		// Else the src is a memory too
@@ -868,7 +872,7 @@ void CHandlerMemorizePhraseOrMacro::execute (CCtrlBase *pCaller, const string &P
 					pPM->sendLearnToServer(newPhraseId);
 
 					// memorize the new phrase
-					memorizePhraseOrMacro(dstMemoryIndex, srcIsMacro, newPhraseId, srcMacroId);
+					memorizePhraseOrMacro(dstMemoryLine, dstMemoryIndex, srcIsMacro, newPhraseId, srcMacroId);
 				}
 				else
 				{
@@ -876,7 +880,7 @@ void CHandlerMemorizePhraseOrMacro::execute (CCtrlBase *pCaller, const string &P
 					pPM->fullDeletePhraseIfLast(dstMemoryLine, dstMemoryIndex);
 
 					// memorize the macro (still a reference)
-					memorizePhraseOrMacro(dstMemoryIndex, srcIsMacro, srcPhraseId, srcMacroId);
+					memorizePhraseOrMacro(dstMemoryLine, dstMemoryIndex, srcIsMacro, srcPhraseId, srcMacroId);
 				}
 			}
 			// else this is a swap!
@@ -887,17 +891,23 @@ void CHandlerMemorizePhraseOrMacro::execute (CCtrlBase *pCaller, const string &P
 				{
 					// get the memory index for src
 					uint	srcMemoryIndex= pCSSrc->getIndexInDB();
+					// get the memory line for src
+					sint32 srcMemoryLine;
+					if (pCSSrc->isShortCut())
+					        srcMemoryLine = pPM->getSelectedMemoryLineDB();
+					else
+					        srcMemoryLine = pPM->getSelectedMemoryAltLineDB();
 					
 					// memorize dst into src
-					memorizePhraseOrMacro(srcMemoryIndex, dstIsMacro, dstPhraseId, dstMacroId);
+					memorizePhraseOrMacro(srcMemoryLine, srcMemoryIndex, dstIsMacro, dstPhraseId, dstMacroId);
 					// memorize src into dst
-					memorizePhraseOrMacro(dstMemoryIndex, srcIsMacro, srcPhraseId, srcMacroId);
+					memorizePhraseOrMacro(dstMemoryLine, dstMemoryIndex, srcIsMacro, srcPhraseId, srcMacroId);
 				}
 				// else, it's a move
 				else
 				{
 					// copy
-					memorizePhraseOrMacro(dstMemoryIndex, srcIsMacro, srcPhraseId, srcMacroId);
+				        memorizePhraseOrMacro(dstMemoryLine, dstMemoryIndex, srcIsMacro, srcPhraseId, srcMacroId);
 
 					// forget src (after shorctut change!)
 					CAHManager::getInstance()->runActionHandler("forget_phrase_or_macro", pCSSrc);
@@ -909,11 +919,10 @@ void CHandlerMemorizePhraseOrMacro::execute (CCtrlBase *pCaller, const string &P
 
 
 // memorize a spell
-void CHandlerMemorizePhraseOrMacro::memorizePhraseOrMacro(uint memoryIndex, bool isMacro, sint32 phraseId, sint32 macroId)
+void CHandlerMemorizePhraseOrMacro::memorizePhraseOrMacro(sint32 memoryLine, uint memoryIndex, bool isMacro, sint32 phraseId, sint32 macroId)
 {
 	CSPhraseManager		*pPM= CSPhraseManager::getInstance();
 
-	sint32	memoryLine= pPM->getSelectedMemoryLineDB();
 	if (memoryLine<0)
 	        return;
 	
@@ -931,11 +940,10 @@ void CHandlerMemorizePhraseOrMacro::memorizePhraseOrMacro(uint memoryIndex, bool
 }
 
 // memorize a default spell
-void CHandlerMemorizePhraseOrMacro::memorizePhraseSheet(uint memoryIndex, uint32 sheetId)
+void CHandlerMemorizePhraseOrMacro::memorizePhraseSheet(sint32 memoryLine, uint memoryIndex, uint32 sheetId)
 {
 	CSPhraseManager		*pPM= CSPhraseManager::getInstance();
 
-	sint32	memoryLine= pPM->getSelectedMemoryLineDB();
 	if(memoryLine<0)
 		return;
 
@@ -989,7 +997,11 @@ public:
 			return;
 
 		// Ok, the user try to forget a phrase slot.
-		sint32	memoryLine= pPM->getSelectedMemoryLineDB();
+		sint32	memoryLine;
+		if (pCSDst->isShortCut())
+		        memoryLine = pPM->getSelectedMemoryLineDB();
+		else
+		        memoryLine = pPM->getSelectedMemoryAltLineDB();
 		if(memoryLine<0)
 			return;
 
@@ -1026,6 +1038,9 @@ public:
 		if (!pCSDst->isSPhraseIdMemory() && !pCSDst->isMacroMemory())
 			return;
 
+		// is alternative action bar
+		bool isMain = pCSDst->isShortCut();
+		
 		// get the memory index
 		uint memoryIndex = pCSDst->getIndexInDB();
 
@@ -1034,7 +1049,9 @@ public:
 
 		// build params string
 		string sParams;
-		sParams.append("memoryIndex=");
+		sParams.append("isMain=");
+		sParams.append(toString(isMain));
+		sParams.append("|memoryIndex=");
 		sParams.append(toString(memoryIndex));
 		sParams.append("|isMacro=");
 		sParams.append(toString(isMacro));
@@ -1066,11 +1083,10 @@ public:
 		// Ok, the user try to forget a phrase slot
 		CSPhraseManager	*pPM = CSPhraseManager::getInstance();
 
-		sint32 memoryLine = pPM->getSelectedMemoryLineDB();
-		if (memoryLine<0)
-			return;
 		
 		// get params
+		bool isMain;
+		fromString(getParam(Params, "isMain"), isMain);
 		uint memoryIndex;
 		fromString(getParam(Params, "memoryIndex"), memoryIndex);
 		bool isMacro;
@@ -1078,6 +1094,14 @@ public:
 		sint32 phraseId;
 		fromString(getParam(Params, "phraseId"),phraseId);
 
+		sint32 memoryLine;
+		if (isMain)
+		        memoryLine = pPM->getSelectedMemoryLineDB();
+		else
+		        memoryLine = pPM->getSelectedMemoryAltLineDB();
+		if (memoryLine<0)
+		        return;
+		
 		if (isMacro)
 		{
 			pPM->forgetMacro(memoryLine, memoryIndex);
@@ -1513,7 +1537,7 @@ public:
 		if (pCSDst->isShortCut())
 			memoryLine = pPM->getSelectedMemoryLineDB();
 		else
-			memoryLine = 0;
+		        memoryLine = pPM->getSelectedMemoryAltLineDB();
 		if(memoryLine<0)
 			return;
 

ryzom/client/src/interface_v3/bot_chat_page_trade.cpp

@@ -588,7 +588,8 @@ void CBotChatPageTrade::updateTradeModal()
 			if ((_BuyMean == MoneyGuildXP) || (_BuyMean == GuildMoney) || (_BuyMean == GuildMoneyGuildXP))
 			{
 				uint64 totalPrice = (uint64) priceWithoutFame * (uint64) quantity;
-				NLGUI::CDBManager::getInstance()->getDbProp("UI:TEMP:TRADE_ITEM:PRICE")->setValue64(totalPrice);
+				NLGUI::CDBManager::getInstance()->getDbProp("UI:TEMP:TRADE_ITEM:UNIT_PRICE")->setValue64(totalPrice);
+				NLGUI::CDBManager::getInstance()->getDbProp("UI:TEMP:TRADE_ITEM:UNIT_PRICE_WITH_FAME")->setValue64(totalPrice);
 				uint64 totalXP = (uint64) getCurrItemXP() * (uint64) quantity;
 				CGuildManager *pGM = CGuildManager::getInstance();
 

ryzom/client/src/interface_v3/chat_text_manager.cpp

@@ -422,6 +422,42 @@ CViewBase *CChatTextManager::createMsgTextComplex(const ucstring &msg, NLMISC::C
 		return para;
 	}
 
+	ucstring::size_type pos = 0;
+
+	// Manage Translations
+	CCDBNodeLeaf	*node= NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TRANSLATION_ONLY_AS_TOOLTIP_CB", false);
+	bool originalFirst = node->getValueBool();
+
+	string::size_type startTr = msg.find(ucstring("{:"));
+	string::size_type endOfOriginal = msg.find(ucstring("}@{"));
+
+	// Original/Translated case, example: {:enHello the world!}@{ Bonjour le monde !
+	if (startTr != string::npos && endOfOriginal != string::npos)
+	{
+		CViewBase *vt = createMsgTextSimple(msg.substr(0, startTr), col, justified, NULL);
+		para->addChild(vt);
+
+		string texture = "flag-"+toLower(msg.substr(startTr+2, 2)).toString()+".tga";
+		ucstring original = msg.substr(startTr+5, endOfOriginal-startTr-5);
+		ucstring translation = msg.substr(endOfOriginal+3);
+		CCtrlButton *ctrlButton = new CCtrlButton(CViewBase::TCtorParam());
+		ctrlButton->setTexture(texture);
+		ctrlButton->setTextureOver(texture);
+		ctrlButton->setTexturePushed(texture);
+		if (!originalFirst)
+		{
+		  ctrlButton->setDefaultContextHelp(original);
+		  pos = endOfOriginal+3;
+		}
+		else
+		{
+		  ctrlButton->setDefaultContextHelp(translation);
+		  pos = startTr+5;
+		  textSize = endOfOriginal;
+		}
+		ctrlButton->setId("tr");
+		para->addChild(ctrlButton);
+	}
 
 	// quickly check if text has links or not
 	bool hasUrl;
@@ -430,8 +466,7 @@ CViewBase *CChatTextManager::createMsgTextComplex(const ucstring &msg, NLMISC::C
 		hasUrl = (s.find(ucstring("http://")) || s.find(ucstring("https://")));
 	}
 
-	ucstring::size_type pos = 0;
+	for (ucstring::size_type i = pos; i< textSize;)
-	for (ucstring::size_type i = 0; i< textSize;)
 	{
 		if (hasUrl && isUrlTag(msg, i, textSize))
 		{

ryzom/client/src/interface_v3/chat_window.cpp

@@ -215,7 +215,11 @@ void CChatWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CChatGr
 	CChatTextManager &ctm = getChatTextMngr();
 
 	gl = dynamic_cast<CGroupList *>(_Chat->getGroup("cb:text_list"));
-	if (gl)	gl->addChild(ctm.createMsgText(msg, col));
+
+	CViewBase *child = ctm.createMsgText(msg, col);
+	if (child)
+	{
+		if (gl)	gl->addChild(child);
 
 		// if the group is closed, make it blink
 		if (!_Chat->isOpen())
@@ -239,6 +243,7 @@ void CChatWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CChatGr
 			(*it)->displayMessage(this, msg, col, numBlinks);
 		}*/
 	}
+}
 
 //=================================================================================
 void CChatWindow::setMenu(const std::string &menuName)
@@ -563,13 +568,18 @@ void CChatGroupWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CC
 	ucstring newmsg = msg;
 	ucstring prefix;
 
+	CViewBase *child = NULL;
 	if (gl != NULL)
 	{
-		gl->addChild(ctm.createMsgText(newmsg, col));
+		child = ctm.createMsgText(newmsg, col);
+		if (child)
+		{
+			gl->addChild(child);
 			if (!gl->getParent()->getActive())
 				if (tab != NULL)
 					tab->setTextColorNormal(newMsgColor);
 		}
+	}
 
 	// *** Display the message in the UserChat (special case)
 	{
@@ -635,14 +645,19 @@ void CChatGroupWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CC
 
 		if (gl != NULL)
 		{
-			gl->addChild(ctm.createMsgText(newmsg, col));
+			child = ctm.createMsgText(newmsg, col);
+			if (child)
+			{
+				gl->addChild(child);
 				if (!gl->getParent()->getActive())
 					if (tab != NULL)
 						tab->setTextColorNormal(newMsgColor);
 			}
 		}
+	}
 
-
+	if (child)
+	{
 		// *** Blink and visibility event
 		// if the group is closed, make it blink
 		if (!_Chat->isOpen())
@@ -662,6 +677,7 @@ void CChatGroupWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CC
 			*windowVisible = isVisible();
 		}
 	}
+}
 
 //=================================================================================
 void CChatGroupWindow::displayTellMessage(const ucstring &msg, NLMISC::CRGBA col, const ucstring &sender)
@@ -685,8 +701,9 @@ void CChatGroupWindow::displayTellMessage(const ucstring &msg, NLMISC::CRGBA col
 		nlwarning("<CChatGroupWindow::displayTellMessage> can't get text_list.");
 		return;
 	}
-
+	CViewBase *child = getChatTextMngr().createMsgText(msg, col);
-	gl->addChild(getChatTextMngr().createMsgText(msg, col));
+	if (child)
+		gl->addChild(child);
 }
 
 //=================================================================================

ryzom/client/src/interface_v3/dbctrl_sheet.cpp

@@ -2875,7 +2875,7 @@ bool CDBCtrlSheet::handleEvent (const NLGUI::CEventDescriptor &event)
 				}
 				else
 				{
-					validClic = isDraggable() && !isDragged() && ((!getItemWeared()&&!getGrayed()) || isShortCut());
+					validClic = isDraggable() && !isDragged() && ((!getItemWeared()&&!getGrayed()) || isSPhraseId());
 				}
 			}
 			if (_Type == SheetType_Macro)

ryzom/client/src/interface_v3/group_in_scene_bubble.cpp

@@ -843,6 +843,29 @@ void CGroupInSceneBubbleManager::chatOpen (uint32 nUID, const ucstring &ucsText,
 	if (pChar == NULL || nUID==CLFECOMMON::INVALID_CLIENT_DATASET_INDEX) return;
 	if (bubbleTimer == 0) bubbleTimer = CWidgetManager::getInstance()->getSystemOption(CWidgetManager::OptionTimeoutBubbles).getValSInt32();
 
+
+
+	// Clean bubble from translation system
+	CCDBNodeLeaf	*node= NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TRANSLATION_ONLY_AS_TOOLTIP_CB", false);
+	bool originalFirst = node->getValueBool();
+
+	ucstring::size_type pos = 0;
+	ucstring::size_type textSize = ucsText.size();
+	string::size_type startTr = ucsText.find(ucstring("{:"));
+	string::size_type endOfOriginal = ucsText.find(ucstring("}@{"));
+	if (endOfOriginal != string::npos)
+	{
+		if (!originalFirst)
+		{
+			pos = endOfOriginal+4;
+		}
+		else
+		{
+			pos = startTr+5;
+			textSize = endOfOriginal;
+		}
+	}
+		
 	// Output the message in a bubble
 
 	bool show = false;
@@ -862,7 +885,7 @@ void CGroupInSceneBubbleManager::chatOpen (uint32 nUID, const ucstring &ucsText,
 				return;
 
 		// Get a bubble
-		CGroupInSceneBubble *bubble = newBubble (ucsText);
+		CGroupInSceneBubble *bubble = newBubble (ucsText.substr(pos, textSize-pos));
 		if (bubble)
 		{
 			// Link the bubble

ryzom/client/src/interface_v3/guild_manager.cpp

@@ -67,6 +67,7 @@ NLMISC_REGISTER_OBJECT(CViewBase, CDBGroupListAscensor, std::string, "list_sheet
 #define VIEW_TEXT_GUILD_QUIT				"ui:interface:guild:content:tab_guild_info:quit_guild"
 #define CTRL_SHEET_GUILD_BLASON				"ui:interface:guild:content:tab_guild_info:blason"
 #define VIEW_TEXT_GUILD_MEMBER_COUNT		"ui:interface:guild:content:tab_guild_info:member_count"
+#define VIEW_TEXT_GUILD_MEMBER_COUNT_ONLINE		"ui:interface:guild:content:tab_guild_info:member_count_online"
 
 
 #define LIST_GUILD_MEMBERS					"ui:interface:guild:content:tab_guild:list_member:guild_members"
@@ -817,6 +818,7 @@ class CAHGuildSheetOpen : public IActionHandler
 			if (pParent == NULL) return;
 			pParent->clearGroups();
 			pParent->setDynamicDisplaySize(false);
+			uint member_online = 0;
 			for (uint i = 0; i < rGuildMembers.size(); i++)
 			{
 				// create the member line
@@ -855,11 +857,13 @@ class CAHGuildSheetOpen : public IActionHandler
 					switch(rGuildMembers[i].Online)
 					{
 					case ccs_online:
+						member_online++;
 						onlineView->setTexture("w_online.tga");
 						if (toolTip)
 							toolTip->setDefaultContextHelp(CI18N::get("uittGuildMemberOnline"));
 						break;
 					case ccs_online_abroad:
+						member_online++;
 						onlineView->setTexture("w_online_abroad.tga");
 						if (toolTip)
 							toolTip->setDefaultContextHelp(CI18N::get("uittGuildMemberOnlineAbroad"));
@@ -895,6 +899,12 @@ class CAHGuildSheetOpen : public IActionHandler
 				pLine->setParent (pParent);
 				pParent->addChild (pLine);
 			}
+			
+			// update member online count view
+			CViewText	*pOnlineMember = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(VIEW_TEXT_GUILD_MEMBER_COUNT_ONLINE));
+			if (pOnlineMember)
+ 				pOnlineMember->setText(toString(member_online));
+			
 		}
 	}
 };

ryzom/client/src/interface_v3/inventory_manager.cpp

@@ -3777,6 +3777,21 @@ void CInventoryManager::sortBag()
 	if (pIconList != NULL) pIconList->needToSort();
 	pList = dynamic_cast<CDBGroupListSheetBag*>(CWidgetManager::getInstance()->getElementFromId(LIST_PA3_TEXT));
 	if (pList != NULL) pList->needToSort();
+
+	pIconList = dynamic_cast<CDBGroupIconListBag*>(CWidgetManager::getInstance()->getElementFromId(LIST_PA4_ICONS));
+	if (pIconList != NULL) pIconList->needToSort();
+	pList = dynamic_cast<CDBGroupListSheetBag*>(CWidgetManager::getInstance()->getElementFromId(LIST_PA4_TEXT));
+	if (pList != NULL) pList->needToSort();
+
+	pIconList = dynamic_cast<CDBGroupIconListBag*>(CWidgetManager::getInstance()->getElementFromId(LIST_PA5_ICONS));
+	if (pIconList != NULL) pIconList->needToSort();
+	pList = dynamic_cast<CDBGroupListSheetBag*>(CWidgetManager::getInstance()->getElementFromId(LIST_PA5_TEXT));
+	if (pList != NULL) pList->needToSort();
+
+	pIconList = dynamic_cast<CDBGroupIconListBag*>(CWidgetManager::getInstance()->getElementFromId(LIST_PA6_ICONS));
+	if (pIconList != NULL) pIconList->needToSort();
+	pList = dynamic_cast<CDBGroupListSheetBag*>(CWidgetManager::getInstance()->getElementFromId(LIST_PA6_TEXT));
+	if (pList != NULL) pList->needToSort();
 }
 
 // ***************************************************************************

ryzom/client/src/interface_v3/inventory_manager.h

@@ -822,6 +822,15 @@ private:
 #define LIST_PA3_TEXT				"ui:interface:inv_pa3:content:iil:bag_list"
 #define LIST_PA3_ICONS				"ui:interface:inv_pa3:content:iil:bag_icons"
 
+#define LIST_PA4_TEXT				"ui:interface:inv_pa4:content:iil:bag_list"
+#define LIST_PA4_ICONS				"ui:interface:inv_pa4:content:iil:bag_icons"
+
+#define LIST_PA5_TEXT				"ui:interface:inv_pa5:content:iil:bag_list"
+#define LIST_PA5_ICONS				"ui:interface:inv_pa5:content:iil:bag_icons"
+
+#define LIST_PA6_TEXT				"ui:interface:inv_pa6:content:iil:bag_list"
+#define LIST_PA6_ICONS				"ui:interface:inv_pa6:content:iil:bag_icons"
+
 // Theorically never used
 #define LIST_BAG2_TEXT				"ui:interface:inv_bag:content:iil:bag_list"
 #define LIST_BAG2_ICONS				"ui:interface:inv_bag:content:iil:bag_icons"

ryzom/client/src/interface_v3/people_interraction.cpp

@@ -311,6 +311,8 @@ void CPeopleInterraction::release()
 	ChatInput.Tell.removeListeningPeopleList(&TeamList);
 	ChatInput.Team.removeListeningPeopleList(&TeamList);
 
+	FriendList.saveContactGroups();
+	
 	CChatWindowManager &cwm = getChatWndMgr();
 
 	AroundMe.release();
@@ -1266,6 +1268,9 @@ void CPeopleInterraction::initContactLists( const std::vector<uint32> &vFriendLi
 		addContactInList(contactIdPool++, vFriendListName[i], vFriendListOnline[i], 0);
 	for (uint i = 0; i < vIgnoreListName.size(); ++i)
 		addContactInList(contactIdPool++, vIgnoreListName[i], ccs_offline, 1);
+	FriendList.readContactGroups();
+	CPeopleList::TSortOrder order = (CPeopleList::TSortOrder)(NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:CONTACT_LIST:SORT_ORDER")->getValue32());
+	FriendList.sortEx(order);
 	updateAllFreeTellerHeaders();
 }
 
@@ -1278,6 +1283,8 @@ void CPeopleInterraction::addContactInList(uint32 contactId, const ucstring &nam
 	// remove the shard name if possible
 	ucstring	name= CEntityCL::removeShardFromName(nameIn);
 
+	
+
 	// add the contact to this list
 	sint index = pl.getIndexFromName(name);
 	// try to create if not found
@@ -2307,6 +2314,56 @@ public:
 };
 REGISTER_ACTION_HANDLER( CHandlerMoveContact, "move_contact");
 
+uint lastPeopleIndexChangeGroup;
+//=================================================================================================================
+class CHandlerChangeContactGroupBegin : public IActionHandler
+{
+public:
+	void execute (CCtrlBase * pCaller, const std::string &sParams)
+	{
+		// retrieve the index of the people
+		CPeopleList *srcList;
+		if (PeopleInterraction.getPeopleFromCurrentMenu(srcList, lastPeopleIndexChangeGroup))
+		{
+			string	groupName= getParam(sParams, "group");
+			CInterfaceGroup *gc = dynamic_cast<CInterfaceGroup *>(CWidgetManager::getInstance()->getElementFromId(groupName));
+			if (gc)
+			{
+				CGroupEditBox *geb = dynamic_cast<CGroupEditBox *>(gc->getGroup("change_contact_group_eb:eb"));
+				geb->setInputString(ucstring(""));
+			}
+			CAHManager::getInstance()->runActionHandler("enter_modal", pCaller, sParams);
+		}
+	}
+};
+REGISTER_ACTION_HANDLER( CHandlerChangeContactGroupBegin, "change_contact_group_begin");
+
+//=================================================================================================================
+// Change the group of a contact in the list
+class CHandlerChangeContactGroup : public IActionHandler
+{
+public:
+	void execute (CCtrlBase *pCaller, const std::string &/* sParams */)
+	{
+		CInterfaceManager *pIM = CInterfaceManager::getInstance();
+
+		if (pCaller)
+		{
+			// Get the modal edit box
+			CGroupEditBox *geb = dynamic_cast<CGroupEditBox *>(CWidgetManager::getInstance()->getElementFromId("ui:interface:change_contact_group:change_contact_group_eb:eb"));
+			if (geb)
+			{
+				
+				PeopleInterraction.FriendList.changeGroup(lastPeopleIndexChangeGroup, geb->getInputString());
+				geb->setInputString(ucstring(""));
+				CPeopleList::TSortOrder order = (CPeopleList::TSortOrder)(NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:CONTACT_LIST:SORT_ORDER")->getValue32());
+				PeopleInterraction.FriendList.sortEx(order);
+			}
+		}
+		CAHManager::getInstance()->runActionHandler("leave_modal", pCaller, "");
+	}
+};
+REGISTER_ACTION_HANDLER( CHandlerChangeContactGroup, "change_contact_group");
 
 //=================================================================================================================
 class CHandlerSortContacts : public IActionHandler

ryzom/client/src/interface_v3/people_list.cpp

@@ -31,6 +31,7 @@
 #include "chat_text_manager.h"
 #include "people_interraction.h"
 #include "../user_entity.h"
+#include "nel/misc/o_xml.h"
 
 using namespace std;
 using namespace NLMISC;
@@ -191,21 +192,28 @@ sint CPeopleList::getIndexFromContainerID(const std::string &id) const
 //==================================================================
 bool CPeopleList::sortExByContactId(const CPeople& a, const CPeople& b)
 {
+	if (a.Group == b.Group)
 		return (a.ContactId < b.ContactId);
+	else
+		return (a.Group < b.Group);
 }
 
 //==================================================================
 bool CPeopleList::sortExByName(const CPeople& a, const CPeople& b)
 {
+	if (a.Group == b.Group) {
 		ucstring name_a = toUpper(a.getName());
 		ucstring name_b = toUpper(b.getName());
-	
 		return (name_a < name_b);
 	}
+	else
+		return (a.Group < b.Group);
+}
 
 //==================================================================
 bool CPeopleList::sortExByOnline(const CPeople& a, const CPeople& b)
 {
+	if (a.Group == b.Group) {
 		ucstring name_a = toUpper(a.getName());
 		ucstring name_b = toUpper(b.getName());
 
@@ -234,9 +242,9 @@ bool CPeopleList::sortExByOnline(const CPeople& a, const CPeople& b)
 				break;
 			}
 		}
-
+	}
-	// Should not get here so just return something
+	else
-	return true;
+		return (a.Group < b.Group);
 }
 
 //==================================================================
@@ -245,9 +253,16 @@ void CPeopleList::sortEx(TSortOrder order)
 	// remove all people from the father container
 	if (!_BaseContainer) return;
 	uint k;
+	
 	for(k = 0; k < _Peoples.size(); ++k)
 	{
-		_BaseContainer->detachContainer(_Peoples[k].Container);
+		CGroupContainer *parentContainer = _Peoples[k].Container->getProprietaryContainer();
+		parentContainer->detachContainer(_Peoples[k].Container);
+	}
+	for (k = 0; k < _GroupContainers.size(); ++k)
+	{
+		if (_GroupContainers[k].second->getProprietaryContainer() != NULL)
+			_BaseContainer->detachContainer(_GroupContainers[k].second);
 	}
 
 	switch (order)
@@ -265,9 +280,27 @@ void CPeopleList::sortEx(TSortOrder order)
 		break;
 	}
 
+	CGroupContainer *group = _BaseContainer;
+	uint groupIndex = 0;
+
 	for(k = 0; k < _Peoples.size(); ++k)
 	{
-		_BaseContainer->attachContainer(_Peoples[k].Container);
+		bool newGroup = false;
+		if (k == 0)
+		{
+			newGroup = true;
+		}
+		while (groupIndex < _GroupContainers.size() && _GroupContainers[groupIndex].first != _Peoples[k].Group.toString())
+		{
+			newGroup = true;
+			++groupIndex;
+		}
+		if (newGroup && groupIndex < _GroupContainers.size() && _GroupContainers.size() > 1)
+		{
+			group = _GroupContainers[groupIndex].second;
+			_BaseContainer->attachContainer(group);
+		}
+		group->attachContainer(_Peoples[k].Container);
 	}
 }
 
@@ -415,8 +448,9 @@ void CPeopleList::removePeople(uint index)
 	}
 	else
 	{
-		if (_BaseContainer)
+		CGroupContainer *parentContainer = _Peoples[index].Container->getProprietaryContainer();
-			_BaseContainer->detachContainer(_Peoples[index].Container);
+		if (parentContainer)
+			parentContainer->detachContainer(_Peoples[index].Container);
 	}
 	CInterfaceManager *im = CInterfaceManager::getInstance();
 	CInterfaceGroup *pRoot = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId("ui:interface"));
@@ -447,6 +481,169 @@ void CPeopleList::setContactId(uint index, uint32 contactId)
 	_Peoples[index].ContactId = contactId;
 }
 
+//==================================================================
+void CPeopleList::changeGroup(uint index, const ucstring &groupName)
+{
+        if (index >= _Peoples.size())
+	{
+		nlwarning("<CPeopleList::changeGroup> bad index.");
+		return;
+	}
+	ucstring group = groupName;
+	if (group.toString() == "General")
+		group = ucstring("");
+	_Peoples[index].Group = group;
+	
+	for (uint k = 0; k < _GroupContainers.size(); ++k)
+	{
+		if (_GroupContainers[k].first == group.toString())
+			return;
+	}
+	
+	vector<pair<string, string> > properties;
+	properties.push_back(make_pair(string("posparent"), string("parent")));
+	properties.push_back(make_pair(string("id"), _ContainerID + "_group_" + toString(_GroupContainers.size())));
+	if (group.toString() == "")
+		properties.push_back(make_pair(string("title"), "General"));
+	else
+		properties.push_back(make_pair(string("title"), group.toString()));
+	CGroupContainer *gc = dynamic_cast<CGroupContainer *>(CWidgetManager::getInstance()->getParser()->createGroupInstance("people_list_group_header", "ui:interface", properties, false));
+
+	if (group.toString() == "")
+		gc->setUCTitle(ucstring("General"));
+	else
+		gc->setUCTitle(group.toString());
+	gc->setSavable(false);
+
+	CInterfaceGroup *pRoot = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId("ui:interface"));
+	pRoot->addGroup (gc);
+	_BaseContainer->attachContainer(gc);
+	
+	_GroupContainers.push_back(make_pair(group.toString(), gc));
+	
+	std::sort(_GroupContainers.begin(), _GroupContainers.end());
+}
+
+//==================================================================
+void CPeopleList::readContactGroups()
+{
+	_GroupContainers.clear();
+
+	// Create default group even if no groups defined
+	vector<pair<string, string> > properties;
+	properties.push_back(make_pair(string("posparent"), string("parent")));
+	properties.push_back(make_pair(string("id"), _ContainerID + "_group_0"));
+	properties.push_back(make_pair(string("title"), "General"));
+	CInterfaceGroup *group = CWidgetManager::getInstance()->getParser()->createGroupInstance("people_list_group_header", "ui:interface", properties, false);
+	CGroupContainer *gc = dynamic_cast<CGroupContainer *>(group);
+	gc->setUCTitle(ucstring("General"));
+	gc->setSavable(false);
+	
+	CInterfaceGroup *pRoot = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId("ui:interface"));
+	pRoot->addGroup (gc);
+	_BaseContainer->attachContainer(gc);
+	
+	_GroupContainers.push_back(make_pair("", gc));
+	
+	const std::string filename = CInterfaceManager::getInstance()->getSaveFileName("contactgroups", "xml");
+	try
+	{
+		CIFile fd;
+		if (fd.open(CPath::lookup(filename)))
+		{
+			CIXml stream;
+			stream.init(fd);
+
+			xmlKeepBlanksDefault(0);
+			xmlNodePtr root = stream.getRootNode();
+
+			if (!root) return;
+
+			xmlNodePtr node = root->children;
+			uint nb = 0;
+			while (node)
+			{
+				CXMLAutoPtr propName;
+				propName = (char*) xmlGetProp(node, (xmlChar*)"name");
+				CXMLAutoPtr propGroup;
+				propGroup = (char*) xmlGetProp(node, (xmlChar*)"group");
+				if (propName && propGroup)
+				{
+				        sint index = getIndexFromName(propName.str());
+					if (index < _Peoples.size())
+					{
+						_Peoples[index].Group = propGroup.str();
+						if (_GroupContainers.empty() || _GroupContainers.back().first != propGroup.str()) {
+							vector<pair<string, string> > properties;
+							properties.push_back(make_pair(string("posparent"), string("parent")));
+							properties.push_back(make_pair(string("id"), _ContainerID + "_group_" + toString(_GroupContainers.size())));
+							if (propGroup.str() == "")
+								properties.push_back(make_pair(string("title"), "General"));
+							else
+								properties.push_back(make_pair(string("title"), propGroup.str()));
+							CInterfaceGroup *group = CWidgetManager::getInstance()->getParser()->createGroupInstance("people_list_group_header", "ui:interface", properties, false);
+							CGroupContainer *gc = dynamic_cast<CGroupContainer *>(group);
+							if (propGroup.str() == "")
+								gc->setUCTitle(ucstring("General"));
+							else
+								gc->setUCTitle(propGroup.str());
+							gc->setSavable(false);
+
+							CInterfaceGroup *pRoot = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId("ui:interface"));
+							pRoot->addGroup (gc);
+							_BaseContainer->attachContainer(gc);
+
+							_GroupContainers.push_back(make_pair(propGroup.str(), gc));
+						}
+					}
+				}
+				node = node->next;
+				nb++;
+			}
+			fd.close();
+		}
+		std::sort(_GroupContainers.begin(), _GroupContainers.end());
+	}
+	catch (const Exception &e)
+	{
+		nlwarning("Error while parsing xml file %s : %s", filename.c_str(), e.what());
+	}
+}
+
+//==================================================================
+void CPeopleList::saveContactGroups()
+{
+        const std::string filename = CInterfaceManager::getInstance()->getSaveFileName("contactgroups", "xml");
+	try
+	{
+		COFile fd;
+		if (fd.open(filename, false, false, true))
+		{
+			COXml stream;
+			stream.init(&fd);
+			
+			xmlDocPtr doc = stream.getDocument();
+			xmlNodePtr node = xmlNewDocNode(doc, NULL, (const xmlChar*)"contact_groups", NULL);
+			xmlDocSetRootElement(doc, node);
+			
+			for (uint k = 0; k < _Peoples.size(); ++k)
+			{
+				xmlNodePtr newNode = xmlNewChild(node, NULL, (const xmlChar*)"contact", NULL);
+				
+				xmlSetProp(newNode, (const xmlChar*)"name", (const xmlChar*)_Peoples[k].getName().toString().c_str());
+				xmlSetProp(newNode, (const xmlChar*)"group", (const xmlChar*)_Peoples[k].Group.toString().c_str());
+			}
+			stream.flush();
+			fd.close();
+		}
+		nlinfo("save %s", filename.c_str());
+	}
+	catch (const Exception &e)
+	{
+		nlwarning("Error while writing the file %s : %s", filename.c_str(), e.what());
+	}
+}
+
 //==================================================================
 void CPeopleList::displayLocalPlayerTell(const ucstring &receiver, uint index, const ucstring &msg,uint numBlinks /*=0*/)
 {
@@ -480,7 +677,10 @@ void CPeopleList::displayLocalPlayerTell(const ucstring &receiver, uint index, c
 	ucstring s = CI18N::get("youTellPlayer");
 	strFindReplace(s, "%name", receiver);
 	strFindReplace(finalMsg, CI18N::get("youTell"), s);
-	gl->addChild(getChatTextMngr().createMsgText(finalMsg, prop.getRGBA()));
+	CViewBase *child = getChatTextMngr().createMsgText(finalMsg, prop.getRGBA());
+	if (child)
+	{
+		gl->addChild(child);
 		CInterfaceManager::getInstance()->log(finalMsg, CChatGroup::groupTypeToString(CChatGroup::tell));
 
 		// if the group is closed, make it blink
@@ -493,6 +693,7 @@ void CPeopleList::displayLocalPlayerTell(const ucstring &receiver, uint index, c
 			_BaseContainer->enableBlink(numBlinks);
 		}
 	}
+}
 
 
 //==================================================================
@@ -539,8 +740,9 @@ void CPeopleList::displayMessage(uint index, const ucstring &msg, NLMISC::CRGBA
 		nlwarning("<CPeopleList::displayMessage> can't get text_list.");
 		return;
 	}
-
+	CViewBase *child = getChatTextMngr().createMsgText(msg, col);
-	gl->addChild(getChatTextMngr().createMsgText(msg, col));
+	if (child)
+		gl->addChild(child);
 }
 
 

ryzom/client/src/interface_v3/people_list.h

@@ -110,6 +110,11 @@ public:
 	void	setContactId(uint index, uint32 contactId);
 	sint	getIndexFromContactId(uint32 contactId);
 
+	// For Friend Groups management
+	void changeGroup(uint index, const ucstring &groupName);
+	void readContactGroups();
+	void saveContactGroups();
+
 	/** Display a message for the given people
 	  * If the window is closed, it causes it to blink (and also the parent window)
 	  */
@@ -151,19 +156,21 @@ public:
 private:
 	struct CPeople
 	{
-		CPeople() : Container(NULL), Chat(NULL), Online(ccs_offline), Blocked(false), ContactId(0) {}
+		CPeople() : Container(NULL), Chat(NULL), Online(ccs_offline), Blocked(false), ContactId(0), Group("") {}
 		NLMISC::CRefPtr<CGroupContainer> Container; // todo : replace this with a CChatWindow one day, for consistency
 		NLMISC::CRefPtr<CGroupContainer> Chat;
 		uint							GlobalID;
 		TCharConnectionState			Online;
 		bool							Blocked;
 		uint32							ContactId;
+		ucstring						Group;
 		bool operator < (const CPeople &other) const { return getName() < other.getName(); }
 		ucstring		getName() const { return Container->getUCTitle(); }
 	};
 	typedef std::vector<CPeople> TPeopleVect;
 private:
 	CGroupContainerPtr				_BaseContainer;
+	std::vector<std::pair<std::string, NLMISC::CRefPtr<CGroupContainer> > >				_GroupContainers;
 	NLMISC::CRefPtr<CChatWindow>	_ChatWindow;
 	TPeopleVect						_Peoples;
 	CPeopleListDesc::TContactType   _ContactType;

ryzom/client/src/interface_v3/sphrase_manager.cpp

@@ -411,7 +411,7 @@ void				CSPhraseManager::forgetPhrase(uint32 memoryLine, uint32 memorySlot)
 	_Memories[memoryLine].Slot[memorySlot].Id= 0;
 
 	// must update DB?
-	if((sint32)memoryLine==_SelectedMemoryDB)
+	if((sint32)memoryLine==_SelectedMemoryDB || (sint32)memoryLine==_SelectedMemoryDBalt)
 	{
 		// update the db
 		updateMemoryDBSlot(memorySlot);
@@ -465,7 +465,7 @@ void				CSPhraseManager::memorizePhrase(uint32 memoryLine, uint32 memorySlot, ui
 	_Memories[memoryLine].Slot[memorySlot].Id= slot;
 
 	// must update DB?
-	if((sint32)memoryLine==_SelectedMemoryDB)
+	if((sint32)memoryLine==_SelectedMemoryDB || (sint32)memoryLine==_SelectedMemoryDBalt)
 	{
 		// update the DB
 		updateMemoryDBSlot(memorySlot);
@@ -3276,7 +3276,7 @@ void	CSPhraseManager::memorizeMacro(uint32 memoryLine, uint32 memorySlot, uint32
 	_Memories[memoryLine].Slot[memorySlot].Id= macroId;
 
 	// must update DB?
-	if((sint32)memoryLine==_SelectedMemoryDB)
+	if((sint32)memoryLine==_SelectedMemoryDB || (sint32)memoryLine==_SelectedMemoryDBalt)
 	{
 		// update the DB
 		updateMemoryDBSlot(memorySlot);
@@ -3302,7 +3302,7 @@ void	CSPhraseManager::forgetMacro(uint32 memoryLine, uint32 memorySlot)
 	_Memories[memoryLine].Slot[memorySlot].Id= 0;
 
 	// must update DB?
-	if((sint32)memoryLine==_SelectedMemoryDB)
+	if((sint32)memoryLine==_SelectedMemoryDB || (sint32)memoryLine==_SelectedMemoryDBalt)
 	{
 		// update the db
 		updateMemoryDBSlot(memorySlot);

ryzom/client/src/item_group_manager.cpp

@@ -733,6 +733,12 @@ std::string CItemGroupManager::toDbPath(INVENTORIES::TInventory inventory)
 		return LIST_PA2_TEXT; break;
 	case INVENTORIES::pet_animal4:
 		return LIST_PA3_TEXT; break;
+	case INVENTORIES::pet_animal5:
+		return LIST_PA4_TEXT; break;
+	case INVENTORIES::pet_animal6:
+		return LIST_PA5_TEXT; break;
+	case INVENTORIES::pet_animal7:
+		return LIST_PA6_TEXT; break;
 	case INVENTORIES::player_room:
 		return LIST_ROOM_TEXT;break;
 	case INVENTORIES::guild:

ryzom/client/src/login_patch.cpp

@@ -1354,7 +1354,7 @@ void CPatchManager::getServerFile (const std::string &name, bool bZipped, const
 		{
 			//nlwarning("EXCEPTION CATCH: getServerFile() failed - try to find an alternative: %i: %s",UsedServer,PatchServers[UsedServer].DisplayedServerPath.c_str());
 
-			nlwarning("EXCEPTION CATCH: getServerFile() failed - try to find an alternative :");
+			nlwarning("EXCEPTION CATCH: getServerFile() failed - try to find an alternative : %s", (serverPath+srcName).c_str());
 			nlwarning("%i", UsedServer);
 			if (UsedServer >= 0 && UsedServer < (int) PatchServers.size())
 			{
@@ -2676,6 +2676,7 @@ void CPatchThread::processFile (CPatchManager::SFileToPatch &rFTP)
 
 	string OutFilename;
 	bool usePatchFile = true;
+	bool haveAllreadyTryiedDownloadingOfFile = false;
 
 	// compute the total size of patch to download
 	uint32 totalPatchSize = 0;
@@ -2743,6 +2744,7 @@ void CPatchThread::processFile (CPatchManager::SFileToPatch &rFTP)
 			{
 				// can not load the 7zip file, use normal patching
 				usePatchFile = true;
+				haveAllreadyTryiedDownloadingOfFile = true;
 				break;
 			}
 
@@ -2754,6 +2756,7 @@ void CPatchThread::processFile (CPatchManager::SFileToPatch &rFTP)
 				{
 					// fallback to standard patch method
 					usePatchFile = true;
+					haveAllreadyTryiedDownloadingOfFile = true;
 					break;
 				}
 			}
@@ -2766,6 +2769,7 @@ void CPatchThread::processFile (CPatchManager::SFileToPatch &rFTP)
 				nlwarning("Failed to unpack lzma file %s", (pPM->ClientPatchPath+lzmaFile).c_str());
 				// fallback to standard patch method
 				usePatchFile = true;
+				haveAllreadyTryiedDownloadingOfFile = true;
 				break;
 			}
 
@@ -2874,8 +2878,83 @@ void CPatchThread::processFile (CPatchManager::SFileToPatch &rFTP)
 			sTranslate = CI18N::get("uiApplyingDelta") + " " + CFile::getFilename(PatchName);
 			pPM->setState(true, sTranslate);
 
-			xDeltaPatch(PatchName, SourceNameXD, OutFilename);
+			bool deltaPatchResult = xDeltaPatch(PatchName, SourceNameXD, OutFilename);
+
+			if (!deltaPatchResult && !haveAllreadyTryiedDownloadingOfFile) // Patch failed, try to download and apply lzma
+			{
+				breakable
+				{
+					// compute the seven zip filename
+					string lzmaFile = rFTP.FileName+".lzma";
+
+					// download the 7zip file
+					try
+					{
+						// first, try in the file version subfolfer
+						try
+						{
+							progress.Scale = 1.f;
+							progress.Bias = 0.f;
+							if (!rFTP.Patches.empty())
+							{
+								pPM->getServerFile(toString("%05u/", rFTP.Patches.back())+lzmaFile, false, "", &progress);
+							}
+							// else -> file comes from a previous download (with .tmp extension, and is up to date)
+							// the remaining code will just rename it with good name and exit
+						}
+						catch (const NLMISC::EWriteError &)
+						{
+							// this is a local error, rethrow ...
+							throw;
+						}
+						catch(...)
+						{
+							// failed with version subfolder, try in the root patch directory
+							pPM->getServerFile(lzmaFile, false, "", &progress);
+						}
+					}
+					catch (const NLMISC::EWriteError &)
+					{
+						// this is a local error, rethrow ...
+						throw;
+					}
+					catch (...)
+					{
+						break;
+					}
+
+					OutFilename = pPM->ClientPatchPath + NLMISC::CFile::getFilename(rFTP.FileName);
+					// try to unpack the file
+					try
+					{
+						if (!unpackLZMA(pPM->ClientPatchPath+lzmaFile, OutFilename+".tmp"))
+						{
+							break;
+						}
+					}
+					catch (const NLMISC::EWriteError&)
+					{
+						throw;
+					}
+					catch (...)
+					{
+						nlwarning("Failed to unpack lzma file %s", (pPM->ClientPatchPath+lzmaFile).c_str());
+						break;
+					}
 
+					if (rFTP.LocalFileExists)
+						pPM->deleteFile(SourceName);
+
+					pPM->deleteFile(pPM->ClientPatchPath+lzmaFile);	// delete the archive file
+					pPM->deleteFile(SourceName, false, false); // File can exists if bad BNP loading
+					if (_CommitPatch)
+					{
+						pPM->renameFile(OutFilename+".tmp", DestinationName);
+					}
+				}
+			}
+			else
+			{
 				if (rFTP.LocalFileExists)
 					pPM->deleteFile(SourceName);
 				pPM->deleteFile(PatchName);
@@ -2903,6 +2982,7 @@ void CPatchThread::processFile (CPatchManager::SFileToPatch &rFTP)
 				}
 			}
 		}
+	}
 	else
 	{
 		PatchSizeProgress += totalPatchSize;
@@ -2915,7 +2995,7 @@ void CPatchThread::processFile (CPatchManager::SFileToPatch &rFTP)
 }
 
 // ****************************************************************************
-void CPatchThread::xDeltaPatch(const string &patch, const string &src, const string &out)
+bool CPatchThread::xDeltaPatch(const string &patch, const string &src, const string &out)
 {
 	// Internal xdelta
 
@@ -2941,12 +3021,13 @@ void CPatchThread::xDeltaPatch(const string &patch, const string &src, const str
 			break;
 			default:
 			{
-				std::string str = toString("Error applying %s to %s giving %s", patch.c_str(), src.c_str(), out.c_str());
+				nlinfo("Error applying %s to %s giving %s", patch.c_str(), src.c_str(), out.c_str());
-				throw Exception (str);
+				return false;
 			}
 			break;
 		}
-	}
+	} else
+		return true;
 
 
 	// Launching xdelta

ryzom/client/src/login_patch.h

@@ -269,6 +269,7 @@ public:
 	void setStartRyzomAtEnd(bool startAtEnd){ _StartRyzomAtEnd = startAtEnd; }
 	// Forward message to installation software if needed
 	void fatalError(const std::string& errorId, const std::string& param1, const std::string& param2);
+	bool bnpUnpack(const std::string &srcBigfile, const std::string &dstPath, std::vector<std::string> &vFilenames);
 
 	const std::string &	getServerVersion () { return ServerVersion; }
 private:
@@ -320,8 +321,6 @@ private:
 
 	void getPatchFromDesc(SFileToPatch &ftpOut, const CBNPFile &fIn, bool forceCheckSumTest);
 
-	bool bnpUnpack(const std::string &srcBigfile, const std::string &dstPath, std::vector<std::string> &vFilenames);
-
 	// stop the threads (called when knowing the thread ended)
 	void stopCheckThread();
 	void stopPatchThread();
@@ -547,7 +546,7 @@ private:
 
 	void run();
 	void processFile (CPatchManager::SFileToPatch &rFTP);
-	void xDeltaPatch(const std::string &patch, const std::string &src, const std::string &out);
+	bool xDeltaPatch(const std::string &patch, const std::string &src, const std::string &out);
 
 };
 /**

ryzom/client/src/net_manager.cpp

@@ -147,6 +147,7 @@ extern bool CharNameValidArrived;
 extern bool CharNameValid;
 bool IsInRingSession = false;
 TSessionId HighestMainlandSessionId; // highest in the position stack
+ucstring lastUniversMessage;
 
 extern const char *CDBBankNames[INVALID_CDB_BANK+1];
 
@@ -769,8 +770,12 @@ void CInterfaceChatDisplayer::displayChat(TDataSetIndex compressedSenderIndex, c
 			PeopleInterraction.ChatInput.Region.displayMessage(finalString, col, 2, &windowVisible);
 		}
 		else if (mode == CChatGroup::universe)
+		{
+			if (lastUniversMessage != finalString)
 			{
 				PeopleInterraction.ChatInput.Universe.displayMessage(finalString, col, 2, &windowVisible);
+				lastUniversMessage = finalString;
+			}
 		}
 		else if (mode == CChatGroup::dyn_chat)
 		{

ryzom/client/src/string_manager_client.cpp

@@ -747,6 +747,12 @@ restartLoop:
 							str = CEntityCL::removeTitleFromName(str);
 						}
 
+						// if the string contains a special rename of creature, remove it
+						if (str.size() > 2 && str[0] == '<' && str[1] == '#')
+						{
+							str = toUpper(str[2])+str.substr(3);
+						}
+
 						// append this string
 						temp.append(move, src+param.ReplacementPoint);
 						temp += str;

ryzom/tools/client/client_patcher/main.cpp

@@ -200,9 +200,38 @@ int main(int argc, char *argv[])
 
 	Args.setVersion(getDisplayVersion());
 	Args.setDescription("Ryzom client");
+	Args.addArg("p", "patch", "patch", "Name of the file to use tp xdelta the source file");
+	Args.addArg("s", "source", "source", "Name of source file to xdelta with patch file");
+	Args.addArg("d", "destination", "destination", "Name of destination operation (patch or unpack)");
+	Args.addArg("u", "unpack", "unpack", "Name of bnp file to unpack");
 
 	if (!Args.parse(argc, argv)) return 1;
 
+	if (Args.haveArg("p") && Args.haveArg("p") && Args.haveArg("p"))
+	{
+		string	patchName = Args.getArg("p").front();
+		string	sourceName = Args.getArg("s").front();
+		string	destinationName = Args.getArg("d").front();
+
+		std::string errorMsg;
+		CXDeltaPatch::TApplyResult ar = CXDeltaPatch::apply(patchName, sourceName, destinationName, errorMsg);
+		nlinfo("%s", errorMsg.c_str());
+		return ar;
+	}
+
+	// initialize patch manager and set the ryzom full path, before it's used
+	CPatchManager *pPM = CPatchManager::getInstance();
+
+	if (Args.haveArg("u") && Args.haveArg("d"))
+	{
+		string	bnpName = Args.getArg("u").front();
+		string	destinationName = Args.getArg("d").front();
+		vector<string> vFilenames;
+		if (pPM->bnpUnpack(bnpName, destinationName, vFilenames))
+			return 0;
+		return 1;
+	}
+
 	// create logs in temporary directory
 	createDebug(CPath::getTemporaryDirectory().c_str(), true, true);
 
@@ -244,8 +273,6 @@ int main(int argc, char *argv[])
 	printf("\n");
 	printf("Checking %s files to patch...\n", convert(CI18N::get("TheSagaOfRyzom")).c_str());
 
-	// initialize patch manager and set the ryzom full path, before it's used
-	CPatchManager *pPM = CPatchManager::getInstance();
 
 	// use PatchUrl
 	vector<string> patchURLs;