Merge with develop

--HG--
branch : compatibility-develop

code/nel/src/misc/i18n.cpp

@@ -382,11 +382,9 @@ std::string CI18N::getSystemLanguageCode ()
 				}
 			}
 #else
-			std::string lang = NLMISC::toLower(lang);
-
 			// only keep 2 first characters
 			if (lang.size() > 1)
-				_SystemLanguageCode = lang.substr(0, 2);
+				_SystemLanguageCode = NLMISC::toLower(lang).substr(0, 2);
 #endif
 		}
 	}

code/ryzom/common/src/game_share/mirrored_data_set_inline.h

@@ -205,7 +205,7 @@ inline bool			CMirroredDataSet::propIsList( TPropertyIndex propIndex ) const
  * Display the values of one property for all entities
  */
 template <class T, class CPropLocationClass>
-inline void			CMirroredDataSet::displayPropValues( TPropertyIndex propIndex, T* pt, NLMISC::CLog& log ) const
+inline void			CMirroredDataSet::displayPropValues( TPropertyIndex propIndex, T* /* pt */, NLMISC::CLog& log ) const
 {
 //	std::stringstream ss;
 //	ss << "Mirror property " << propIndex << ":" << endl;

code/ryzom/tools/client/client_patcher/main.cpp

@@ -5,8 +5,6 @@
 
 #include "nel/misc/cmd_args.h"
 
-#include <locale.h>
-
 #ifdef NL_OS_WINDOWS
 #include <windows.h>
 #endif