From f376317f101326c22165248367fee58d45f773e0 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Fri, 18 Mar 2016 22:26:43 +0100
Subject: [PATCH 1/2] Fixed: Compilation

--HG--
branch : develop
---
 code/nel/src/misc/i18n.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/code/nel/src/misc/i18n.cpp b/code/nel/src/misc/i18n.cpp
index e230eab2d..b64116c1c 100644
--- a/code/nel/src/misc/i18n.cpp
+++ b/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
 		}
 	}

From a7b3532687f2055d30c9500367e9d3ab5f11d786 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Fri, 18 Mar 2016 22:26:58 +0100
Subject: [PATCH 2/2] Changed: Minor changes

--HG--
branch : develop
---
 code/ryzom/common/src/game_share/mirrored_data_set_inline.h | 2 +-
 code/ryzom/tools/client/client_patcher/main.cpp             | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/code/ryzom/common/src/game_share/mirrored_data_set_inline.h b/code/ryzom/common/src/game_share/mirrored_data_set_inline.h
index 50ab076b7..69607b7dd 100644
--- a/code/ryzom/common/src/game_share/mirrored_data_set_inline.h
+++ b/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;
diff --git a/code/ryzom/tools/client/client_patcher/main.cpp b/code/ryzom/tools/client/client_patcher/main.cpp
index f03943345..08be87fbe 100644
--- a/code/ryzom/tools/client/client_patcher/main.cpp
+++ b/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