diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index c708b9dda..3824e7640 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -116,6 +116,10 @@ FIND_PACKAGE(OpenSSL REQUIRED)
 FIND_PACKAGE(GIF)
 FIND_PACKAGE(Jpeg)
 
+IF(WIN32)
+  SET(OPENSSL_LIBRARIES ${OPENSSL_LIBRARIES} Crypt32.lib)
+ENDIF()
+
 IF(WITH_LIBOVR)
   FIND_PACKAGE(LibOVR)
 ENDIF()
@@ -447,8 +451,6 @@ IF(WITH_NEL)
             SET(CURL_LIBRARIES ${CURL_LIBRARIES} ${INTL_LIBRARY})
           ENDIF()
         ENDIF()
-      ELSEIF(WIN32)
-        SET(CURL_LIBRARIES ${CURL_LIBRARIES} Crypt32.lib)
       ENDIF()
     ENDIF()
   ENDIF()
diff --git a/code/CMakeModules/FindMSVC.cmake b/code/CMakeModules/FindMSVC.cmake
index af44f6676..9d5fc5cf7 100644
--- a/code/CMakeModules/FindMSVC.cmake
+++ b/code/CMakeModules/FindMSVC.cmake
@@ -56,16 +56,18 @@ MACRO(DETECT_VC_VERSION_HELPER _ROOT _VERSION)
 ENDMACRO()
 
 MACRO(DETECT_VC_VERSION _VERSION)
-  SET(VC${_VERSION}_FOUND OFF)
-  DETECT_VC_VERSION_HELPER("HKEY_CURRENT_USER" ${_VERSION})
+  IF(NOT VC_FOUND)
+    SET(VC${_VERSION}_FOUND OFF)
+    DETECT_VC_VERSION_HELPER("HKEY_CURRENT_USER" ${_VERSION})
 
-  IF(NOT VC${_VERSION}_FOUND)
-    DETECT_VC_VERSION_HELPER("HKEY_LOCAL_MACHINE" ${_VERSION})
-  ENDIF()
+    IF(NOT VC${_VERSION}_FOUND)
+      DETECT_VC_VERSION_HELPER("HKEY_LOCAL_MACHINE" ${_VERSION})
+    ENDIF()
 
-  IF(VC${_VERSION}_FOUND)
-    SET(VC_FOUND ON)
-    SET(VC_DIR "${VC${_VERSION}_DIR}")
+    IF(VC${_VERSION}_FOUND)
+      SET(VC_FOUND ON)
+      SET(VC_DIR "${VC${_VERSION}_DIR}")
+    ENDIF()
   ENDIF()
 ENDMACRO()
 
@@ -77,7 +79,7 @@ MACRO(DETECT_EXPRESS_VERSION _VERSION)
   ENDIF()
 ENDMACRO()
 
-IF(MSVC1411 OR MSVC1410)
+IF(MSVC_VERSION GREATER 1909)
   DETECT_VC_VERSION("15.0")
   SET(MSVC_TOOLSET "140")
 
@@ -98,44 +100,18 @@ IF(MSVC1411 OR MSVC1410)
 
   SET(VC_DIR "${VC_DIR}/${MSVC_TOOLCHAIN_VERSION}")
   SET(VC_INCLUDE_DIR "${VC_DIR}/include")
-
-  IF(NOT MSVC14_REDIST_DIR)
-    # If you have VC++ 2017 Express, put x64/Microsoft.VC141.CRT/*.dll in ${EXTERNAL_PATH}/redist
-    # original files whould be in ${VC_DIR}/Redist/MSVC/14.11.25325/x64/Microsoft.VC141.CRT
-    SET(MSVC14_REDIST_DIR "${EXTERNAL_PATH}/redist")
-  ENDIF()
 ELSEIF(MSVC14)
   DETECT_VC_VERSION("14.0")
   SET(MSVC_TOOLSET "140")
-
-  IF(NOT MSVC14_REDIST_DIR)
-    # If you have VC++ 2015 Express, put x64/Microsoft.VC140.CRT/*.dll in ${EXTERNAL_PATH}/redist
-    SET(MSVC14_REDIST_DIR "${EXTERNAL_PATH}/redist")
-  ENDIF()
 ELSEIF(MSVC12)
   DETECT_VC_VERSION("12.0")
   SET(MSVC_TOOLSET "120")
-
-  IF(NOT MSVC12_REDIST_DIR)
-    # If you have VC++ 2013 Express, put x64/Microsoft.VC120.CRT/*.dll in ${EXTERNAL_PATH}/redist
-    SET(MSVC12_REDIST_DIR "${EXTERNAL_PATH}/redist")
-  ENDIF()
 ELSEIF(MSVC11)
   DETECT_VC_VERSION("11.0")
   SET(MSVC_TOOLSET "110")
-
-  IF(NOT MSVC11_REDIST_DIR)
-    # If you have VC++ 2012 Express, put x64/Microsoft.VC110.CRT/*.dll in ${EXTERNAL_PATH}/redist
-    SET(MSVC11_REDIST_DIR "${EXTERNAL_PATH}/redist")
-  ENDIF()
 ELSEIF(MSVC10)
   DETECT_VC_VERSION("10.0")
   SET(MSVC_TOOLSET "100")
-
-  IF(NOT MSVC10_REDIST_DIR)
-    # If you have VC++ 2010 Express, put x64/Microsoft.VC100.CRT/*.dll in ${EXTERNAL_PATH}/redist
-    SET(MSVC10_REDIST_DIR "${EXTERNAL_PATH}/redist")
-  ENDIF()
 ELSEIF(MSVC90)
   DETECT_VC_VERSION("9.0")
   SET(MSVC_TOOLSET "90")
@@ -147,6 +123,8 @@ ENDIF()
 # If you plan to use VC++ compilers with WINE, set VC_DIR environment variable
 IF(NOT VC_DIR)
   SET(VC_DIR $ENV{VC_DIR})
+  # Fix path
+  FILE(TO_CMAKE_PATH ${VC_DIR} VC_DIR)
 ENDIF()
 
 IF(NOT VC_DIR)
@@ -158,8 +136,44 @@ IF(NOT VC_DIR)
   STRING(REGEX REPLACE "/(bin|BIN|Bin)/.+" "" VC_DIR ${_COMPILER})
 ENDIF()
 
-IF(NOT VC_INCLUDE_DIR)
+IF(NOT VC_INCLUDE_DIR AND VC_DIR AND EXISTS "${VC_DIR}")
   SET(VC_INCLUDE_DIR "${VC_DIR}/include")
+  IF(EXISTS "${VC_INCLUDE_DIR}")
+    SET(VC_FOUND ON)
+  ENDIF()
+ENDIF()
+
+SET(MSVC_REDIST_DIR "${EXTERNAL_PATH}/redist")
+
+IF(NOT EXISTS "${MSVC_REDIST_DIR}")
+  SET(MSVC_REDIST_DIR "${VC_DIR}/redist")
+  
+  IF(NOT EXISTS "${MSVC_REDIST_DIR}")
+    SET(MSVC_REDIST_DIR)
+  ENDIF()
+ENDIF()
+
+IF(MSVC_REDIST_DIR)
+  IF(MSVC1411 OR MSVC1410)
+    # If you have VC++ 2017 Express, put x64/Microsoft.VC141.CRT/*.dll in ${EXTERNAL_PATH}/redist
+    # original files whould be in ${VC_DIR}/Redist/MSVC/14.11.25325/x64/Microsoft.VC141.CRT
+    SET(MSVC14_REDIST_DIR "${MSVC_REDIST_DIR}")
+  ELSEIF(MSVC14)
+    SET(MSVC14_REDIST_DIR "${MSVC_REDIST_DIR}")
+  ELSEIF(MSVC12)
+    # If you have VC++ 2013 Express, put x64/Microsoft.VC120.CRT/*.dll in ${EXTERNAL_PATH}/redist
+    SET(MSVC12_REDIST_DIR "${MSVC_REDIST_DIR}")
+  ELSEIF(MSVC11)
+    # If you have VC++ 2012 Express, put x64/Microsoft.VC110.CRT/*.dll in ${EXTERNAL_PATH}/redist
+    SET(MSVC11_REDIST_DIR "${MSVC_REDIST_DIR}")
+  ELSEIF(MSVC10)
+      # If you have VC++ 2010 Express, put x64/Microsoft.VC100.CRT/*.dll in ${EXTERNAL_PATH}/redist
+    SET(MSVC10_REDIST_DIR "${MSVC_REDIST_DIR}")
+  ELSEIF(MSVC90)
+    SET(MSVC90_REDIST_DIR "${MSVC_REDIST_DIR}")
+  ELSEIF(MSVC80)
+    SET(MSVC80_REDIST_DIR "${MSVC_REDIST_DIR}")
+  ENDIF()
 ENDIF()
 
 MESSAGE(STATUS "Using headers from ${VC_INCLUDE_DIR}")
diff --git a/code/CMakeModules/FindMySQL.cmake b/code/CMakeModules/FindMySQL.cmake
index f2b62fc59..8a92cb0c4 100644
--- a/code/CMakeModules/FindMySQL.cmake
+++ b/code/CMakeModules/FindMySQL.cmake
@@ -69,6 +69,9 @@ ELSE()
       ENDIF()
       FIND_PACKAGE(OpenSSL)
       IF(OPENSSL_FOUND)
+        IF(WIN32)
+          SET(OPENSSL_LIBRARIES ${OPENSSL_LIBRARIES} Crypt32.lib)
+        ENDIF()
         SET(MYSQL_LIBRARIES ${MYSQL_LIBRARIES} ${OPENSSL_LIBRARIES})
       ENDIF()
     ENDIF()
diff --git a/code/CMakeModules/FindWindowsSDK.cmake b/code/CMakeModules/FindWindowsSDK.cmake
index 0e2735570..3d9c43bd9 100644
--- a/code/CMakeModules/FindWindowsSDK.cmake
+++ b/code/CMakeModules/FindWindowsSDK.cmake
@@ -240,7 +240,7 @@ MACRO(USE_CURRENT_WINSDK)
 
   IF(NOT WINSDK_DIR)
     # Use Windows SDK versions installed with VC++ when possible
-    IF(MSVC1411 OR MSVC1410)
+    IF(MSVC_VERSION GREATER 1909)
       # Special case, use Kits for SDK
       SET(WINSDK_VERSION "10.0")
       SET(WINSDK_DIR ${WINSDK_UCRT_DIR})
@@ -484,7 +484,7 @@ IF(WINSDK_INCLUDE_DIR)
 
   SET(CMAKE_LIBRARY_PATH ${WINSDK_LIBRARY_DIR} ${CMAKE_LIBRARY_PATH})
 
-  # Fix for using Windows SDK 7.1 with Visual C++ 2012, 2013 and 2015
+  # Fix for using Windows SDK 7.1 with Visual C++ 2012, 2013, 2015 and 2017
   IF(WINSDK_VERSION STREQUAL "7.1" AND (MSVC11 OR MSVC12 OR MSVC14))
     ADD_DEFINITIONS(-D_USING_V110_SDK71_)
   ENDIF()
diff --git a/code/CMakeModules/Findassimp.cmake b/code/CMakeModules/Findassimp.cmake
index 41e53cf94..b4bf0da99 100644
--- a/code/CMakeModules/Findassimp.cmake
+++ b/code/CMakeModules/Findassimp.cmake
@@ -1,29 +1,63 @@
+IF(assimp_FIND_REQUIRED)
+  SET(ASSIMP_FIND_REQUIRED ON)
+ENDIF()
+
 FIND_PATH(
-	assimp_INCLUDE_DIRS
+	ASSIMP_INCLUDE_DIRS
 	NAMES assimp/postprocess.h assimp/scene.h assimp/version.h assimp/config.h assimp/cimport.h
 	PATHS /usr/local/include/
 )
 
 FIND_LIBRARY(
-	assimp_LIBRARIES
+	ASSIMP_LIBRARY_RELEASE
 	NAMES assimp
 	PATHS /usr/local/lib/
 )
 
-IF (assimp_INCLUDE_DIRS AND assimp_LIBRARIES)
-    SET(assimp_FOUND TRUE)
+FIND_LIBRARY(
+	IRRXML_LIBRARY_RELEASE
+	NAMES IrrXML
+	PATHS /usr/local/lib/
+)
+
+FIND_LIBRARY(
+	ASSIMP_LIBRARY_DEBUG
+	NAMES assimpd
+	PATHS /usr/local/lib/
+)
+
+FIND_LIBRARY(
+	IRRXML_LIBRARY_DEBUG
+	NAMES IrrXMLd
+	PATHS /usr/local/lib/
+)
+
+IF (ASSIMP_INCLUDE_DIRS)
+    SET(ASSIMP_FOUND TRUE)
+    IF(ASSIMP_LIBRARY_RELEASE)
+      SET(ASSIMP_LIBRARIES ${ASSIMP_LIBRARIES} optimized ${ASSIMP_LIBRARY_RELEASE})
+    ENDIF()
+    IF(ASSIMP_LIBRARY_DEBUG)
+      SET(ASSIMP_LIBRARIES ${ASSIMP_LIBRARIES} debug ${ASSIMP_LIBRARY_DEBUG})
+    ENDIF()
     FIND_PACKAGE(ZLIB)
     IF(ZLIB_FOUND)
-        SET(assimp_LIBRARIES ${assimp_LIBRARIES} ${ZLIB_LIBRARIES})
+        SET(ASSIMP_LIBRARIES ${ASSIMP_LIBRARIES} ${ZLIB_LIBRARIES})
     ENDIF()
-ENDIF (assimp_INCLUDE_DIRS AND assimp_LIBRARIES)
+    IF(IRRXML_LIBRARY_RELEASE)
+      SET(ASSIMP_LIBRARIES ${ASSIMP_LIBRARIES} optimized ${IRRXML_LIBRARY_RELEASE})
+    ENDIF()
+    IF(IRRXML_LIBRARY_DEBUG)
+      SET(ASSIMP_LIBRARIES ${ASSIMP_LIBRARIES} debug ${IRRXML_LIBRARY_DEBUG})
+    ENDIF()
+ENDIF()
 
-IF (assimp_FOUND)
-    IF (NOT assimp_FIND_QUIETLY)
-        MESSAGE(STATUS "Found asset importer library: ${assimp_LIBRARIES}")
-    ENDIF (NOT assimp_FIND_QUIETLY)
-ELSE (assimp_FOUND)
-    IF (assimp_FIND_REQUIRED)
+IF (ASSIMP_FOUND)
+    IF (NOT ASSIMP_FIND_QUIETLY)
+        MESSAGE(STATUS "Found asset importer library: ${ASSIMP_LIBRARIES}")
+    ENDIF ()
+ELSE (ASSIMP_FOUND)
+    IF (ASSIMP_FIND_REQUIRED)
         MESSAGE(FATAL_ERROR "Could not find asset importer library")
-    ENDIF (assimp_FIND_REQUIRED)
-ENDIF (assimp_FOUND)
+    ENDIF ()
+ENDIF ()
diff --git a/code/CMakeModules/OSXToolChain.cmake b/code/CMakeModules/OSXToolChain.cmake
index 3036aec01..3169aec78 100644
--- a/code/CMakeModules/OSXToolChain.cmake
+++ b/code/CMakeModules/OSXToolChain.cmake
@@ -24,9 +24,25 @@ IF(DEFINED CMAKE_CROSSCOMPILING)
 ENDIF()
 
 # Force the compilers to Clang for OS X
+
+# C
 SET(CMAKE_C_COMPILER x86_64-apple-darwin15-clang)
+SET(CMAKE_C_STANDARD_COMPUTED_DEFAULT "11")
+SET(CMAKE_C_COMPILE_FEATURES "c_std_90;c_function_prototypes;c_std_99;c_restrict;c_variadic_macros;c_std_11;c_static_assert")
+SET(CMAKE_C90_COMPILE_FEATURES "c_std_90;c_function_prototypes")
+SET(CMAKE_C99_COMPILE_FEATURES "c_std_99;c_restrict;c_variadic_macros")
+SET(CMAKE_C11_COMPILE_FEATURES "c_std_11;c_static_assert")
+
+# C++
 SET(CMAKE_CXX_COMPILER x86_64-apple-darwin15-clang++)
-set(CMAKE_CXX_COMPILER_ID "AppleClang")
+SET(CMAKE_CXX_COMPILE_FEATURES "cxx_std_98;cxx_template_template_parameters;cxx_std_11;cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates;cxx_std_14;cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates;cxx_std_17")
+SET(CMAKE_CXX98_COMPILE_FEATURES "cxx_std_98;cxx_template_template_parameters")
+SET(CMAKE_CXX11_COMPILE_FEATURES "cxx_std_11;cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates")
+SET(CMAKE_CXX14_COMPILE_FEATURES "cxx_std_14;cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates")
+SET(CMAKE_CXX17_COMPILE_FEATURES "cxx_std_17")
+
+# make
+SET(CMAKE_MAKE_PROGRAM make)
 
 # Skip the platform compiler checks for cross compiling.
 SET(CMAKE_CXX_COMPILER_FORCED TRUE)
@@ -86,9 +102,10 @@ SET(CMAKE_OSX_SYSROOT ${CMAKE_OSX_SYSROOT}/MacOSX${OSX_SDK}.sdk)
 
 # Standard settings
 SET(CMAKE_SYSTEM_NAME Darwin)
-set(CMAKE_SYSTEM "Darwin-15.0.0")
-set(CMAKE_SYSTEM_VERSION "15.0.0")
-set(CMAKE_SYSTEM_PROCESSOR "x86_64")
+SET(CMAKE_SYSTEM "Darwin-15.0.0")
+SET(CMAKE_SYSTEM_VERSION "15.0.0")
+SET(CMAKE_SYSTEM_PROCESSOR "x86_64")
+
 SET(UNIX ON)
 SET(APPLE ON)
 
@@ -112,4 +129,3 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 
 # determinate location for bin utils based on CMAKE_FIND_ROOT_PATH
 INCLUDE(CMakeFindBinUtils)
-
diff --git a/code/nel/include/nel/3d/flare_shape.h b/code/nel/include/nel/3d/flare_shape.h
index 044c53c11..b0c35257b 100644
--- a/code/nel/include/nel/3d/flare_shape.h
+++ b/code/nel/include/nel/3d/flare_shape.h
@@ -55,7 +55,7 @@ public:
 		CFlareShape();
 
 		/// serial this shape
-		void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+		void serial(NLMISC::IStream &f);
 		//@}
 
 
diff --git a/code/nel/include/nel/3d/key.h b/code/nel/include/nel/3d/key.h
index d30bfcd6e..6982dc98b 100644
--- a/code/nel/include/nel/3d/key.h
+++ b/code/nel/include/nel/3d/key.h
@@ -47,7 +47,7 @@ public:
 public:
 
 	/// Serial
-	void serial (NLMISC::IStream& f) throw (NLMISC::EStream)
+	void serial (NLMISC::IStream& f)
 	{
 		// Version number
 		(void)f.serialVersion (0);
@@ -83,7 +83,7 @@ class CKeyTCB : public CKey<T>
 public:
 
 	/// Serial
-	void serial (NLMISC::IStream& f) throw (NLMISC::EStream)
+	void serial (NLMISC::IStream& f)
 	{
 		// Version number
 		(void)f.serialVersion (0);
@@ -130,7 +130,7 @@ class CKeyBezier : public CKey<T>
 public:
 
 	/// Serial
-	void serial (NLMISC::IStream& f) throw (NLMISC::EStream)
+	void serial (NLMISC::IStream& f)
 	{
 		// Version number
 		(void)f.serialVersion (0);
@@ -180,7 +180,7 @@ template<> class	CKeyTCB<NLMISC::CAngleAxis> : public CKey<NLMISC::CAngleAxis>
 public:
 
 	/// Serial
-	void serial (NLMISC::IStream& f) throw (NLMISC::EStream)
+	void serial (NLMISC::IStream& f)
 	{
 		// Version number
 		(void)f.serialVersion (0);
@@ -228,7 +228,7 @@ template<> class	CKeyBezier<NLMISC::CQuat> : public CKey<NLMISC::CQuat>
 public:
 
 	/// Serial
-	void serial (NLMISC::IStream& f) throw (NLMISC::EStream)
+	void serial (NLMISC::IStream& f)
 	{
 		// Version number
 		(void)f.serialVersion (0);
diff --git a/code/nel/include/nel/3d/mesh.h b/code/nel/include/nel/3d/mesh.h
index 780a455aa..25872a063 100644
--- a/code/nel/include/nel/3d/mesh.h
+++ b/code/nel/include/nel/3d/mesh.h
@@ -85,7 +85,7 @@ public:
 		// This is slow but doesn't matter since used at mesh building....
 		CCorner();
 
-		void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+		void serial(NLMISC::IStream &f);
 	};
 
 	/// A Triangle face.
@@ -94,7 +94,7 @@ public:
 		CCorner		Corner[3];
 		sint32		MaterialId;
 		sint32      SmoothGroup;
-		void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+		void serial(NLMISC::IStream &f);
 	};
 
 
@@ -118,7 +118,7 @@ public:
 			}
 		}
 
-		void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+		void serial(NLMISC::IStream &f);
 	};
 
 	struct CVertLink
@@ -203,7 +203,7 @@ public:
 		CMeshBuild();
 
 		// Serialization
-		//void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+		//void serial(NLMISC::IStream &f);
 
 	};
 	//@}
@@ -257,7 +257,7 @@ public:
 	virtual void	render(IDriver *drv, CTransformShape *trans, bool opaquePass);
 
 	/// serial this mesh.
-	virtual void	serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void	serial(NLMISC::IStream &f);
 	NLMISC_DECLARE_CLASS(CMesh);
 
 	/// get trinagle count.
@@ -370,7 +370,7 @@ public:
 	virtual float	getNumTriangles (float distance);
 
 	/// serial this mesh.
-	virtual void	serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void	serial(NLMISC::IStream &f);
 	NLMISC_DECLARE_CLASS(CMeshGeom);
 
 	// profile
diff --git a/code/nel/include/nel/3d/mesh_base.h b/code/nel/include/nel/3d/mesh_base.h
index 816d8b7a4..9fb4f9029 100644
--- a/code/nel/include/nel/3d/mesh_base.h
+++ b/code/nel/include/nel/3d/mesh_base.h
@@ -146,7 +146,7 @@ public:
 		CMeshBaseBuild();
 
 		// Serialization is not used
-		//void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+		//void serial(NLMISC::IStream &f);
 	};
 	//@}
 
@@ -201,7 +201,7 @@ public:
 	// @}
 
 	/// serial the base Part of this mesh.
-	void	serialMeshBase(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void	serialMeshBase(NLMISC::IStream &f);
 
 	/// Flush textures
 	void	flushTextures (IDriver &driver, uint selectedTexture);
diff --git a/code/nel/include/nel/3d/mesh_morpher.h b/code/nel/include/nel/3d/mesh_morpher.h
index b9d8879e2..909d60586 100644
--- a/code/nel/include/nel/3d/mesh_morpher.h
+++ b/code/nel/include/nel/3d/mesh_morpher.h
@@ -43,7 +43,7 @@ public:
 
 	std::vector<uint32>	VertRefs;	// Array of vertices reference
 
-	void serial (NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial (NLMISC::IStream &f);
 };
 
 // ***************************************************************************
@@ -90,7 +90,7 @@ public:
 						NLMISC::CObjectVector<CRawSkinVertex*, false>	&vertexRemap,
 						std::vector<CAnimatedMorph> *pBSFactor);
 
-	void serial (NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial (NLMISC::IStream &f);
 
 private:
 
diff --git a/code/nel/include/nel/3d/mesh_mrm.h b/code/nel/include/nel/3d/mesh_mrm.h
index d0ce7d952..619908499 100644
--- a/code/nel/include/nel/3d/mesh_mrm.h
+++ b/code/nel/include/nel/3d/mesh_mrm.h
@@ -115,7 +115,7 @@ public:
 	virtual float	getNumTriangles (float distance);
 
 	/// serial this meshGeom.
-	virtual void	serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void	serial(NLMISC::IStream &f);
 	NLMISC_DECLARE_CLASS(CMeshMRMGeom);
 
 	/// Scene profile
@@ -579,11 +579,11 @@ private:
 
 
 	/// load the header of this mesh. return the version of the header.
-	sint		loadHeader(NLMISC::IStream &f) throw(NLMISC::EStream);
+	sint		loadHeader(NLMISC::IStream &f);
 	/// load this mesh.
-	void		load(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void		load(NLMISC::IStream &f);
 	/// save the entire mesh.
-	void		save(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void		save(NLMISC::IStream &f);
 
 	// Build bone Usage information for serialized mesh <= version 2.
 	void		buildBoneUsageVer2 ();
@@ -702,7 +702,7 @@ public:
 	virtual float	getNumTriangles (float distance);
 
 	/// serial this mesh.
-	virtual void	serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void	serial(NLMISC::IStream &f);
 	NLMISC_DECLARE_CLASS(CMeshMRM);
 
 	/// Get bbox.
diff --git a/code/nel/include/nel/3d/mesh_multi_lod.h b/code/nel/include/nel/3d/mesh_multi_lod.h
index 445941ed6..a79d5a63e 100644
--- a/code/nel/include/nel/3d/mesh_multi_lod.h
+++ b/code/nel/include/nel/3d/mesh_multi_lod.h
@@ -125,7 +125,7 @@ public:
 	virtual void	getAABBox(NLMISC::CAABBox &bbox) const;
 
 	/// serial this mesh.
-	virtual void	serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void	serial(NLMISC::IStream &f);
 
 	/// Declare name of the shape
 	NLMISC_DECLARE_CLASS(CMeshMultiLod);
@@ -238,7 +238,7 @@ private:
 		std::vector<TCoarseMeshIndexType>	CoarseTriangles;
 
 		/// Serial
-		void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+		void serial(NLMISC::IStream &f);
 
 		///  Is Opaque ?
 		bool isOpaque() { return (Flags&IsOpaque)!=0; }
diff --git a/code/nel/include/nel/3d/meshvp_per_pixel_light.h b/code/nel/include/nel/3d/meshvp_per_pixel_light.h
index a234feddd..4533464a9 100644
--- a/code/nel/include/nel/3d/meshvp_per_pixel_light.h
+++ b/code/nel/include/nel/3d/meshvp_per_pixel_light.h
@@ -65,7 +65,7 @@ public:
 							  const NLMISC::CMatrix &invertedModelMat,
 							  const NLMISC::CVector &viewerPos);
 		virtual	void	end(IDriver *drv);
-		virtual void	serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+		virtual void	serial(NLMISC::IStream &f);
 		virtual void	setupForMaterial(const CMaterial &mat,
 										 IDriver *drv,
 										 CScene *scene,
diff --git a/code/nel/include/nel/3d/meshvp_wind_tree.h b/code/nel/include/nel/3d/meshvp_wind_tree.h
index d8e7598b7..790a2f774 100644
--- a/code/nel/include/nel/3d/meshvp_wind_tree.h
+++ b/code/nel/include/nel/3d/meshvp_wind_tree.h
@@ -90,7 +90,7 @@ public:
 	virtual float	getMaxVertexMove();
 
 	// Serial.
-	virtual void	serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void	serial(NLMISC::IStream &f);
 	NLMISC_DECLARE_CLASS(CMeshVPWindTree);
 
 	// @}
diff --git a/code/nel/include/nel/3d/packed_world.h b/code/nel/include/nel/3d/packed_world.h
index d76c180ba..a091c61fb 100644
--- a/code/nel/include/nel/3d/packed_world.h
+++ b/code/nel/include/nel/3d/packed_world.h
@@ -54,9 +54,9 @@ public:
 	void build(std::vector<TPackedZoneBaseSPtr> &packesZones);
 	bool raytrace(const NLMISC::CVector &start, const NLMISC::CVector &end, NLMISC::CVector &inter, std::vector<NLMISC::CTriangle> *testedTriangles = NULL, NLMISC::CVector *normal = NULL);
 	void getZones(std::vector<TPackedZoneBaseSPtr> &zones);
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 	// just serialize the header, containing name of the zones this CPackedWorld was built from
-	void serialZoneNames(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serialZoneNames(NLMISC::IStream &f);
 	/** Roughly select triangles that are within a convex 2D polygon (world coordinates)
 	  * Selection is not exact, because limited to the resolution of the grid into which is packed each zone.
 	  * Triangle that are within are guaranteed to be selected, however.
@@ -68,7 +68,7 @@ private:
 	public:
 		TPackedZoneBaseSPtr Zone;
 		uint32				RaytraceCounter;
-		void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+		void serial(NLMISC::IStream &f)
 		{
 			f.serialVersion(1);
 			CPackedZoneBase *pz = Zone;
@@ -81,7 +81,7 @@ private:
 	{
 	public:
 		std::vector<uint32> IDs; // make a class from this vector just for serialization
-		void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+		void serial(NLMISC::IStream &f)
 		{
 			f.serialCont(IDs);
 		}
diff --git a/code/nel/include/nel/3d/packed_zone.h b/code/nel/include/nel/3d/packed_zone.h
index 2beb5f5ed..52f76097a 100644
--- a/code/nel/include/nel/3d/packed_zone.h
+++ b/code/nel/include/nel/3d/packed_zone.h
@@ -52,7 +52,7 @@ class CPackedVertex
 public:
 	uint16 X, Y, Z;
 public:
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serial(X, Y, Z);
 	}
@@ -68,7 +68,7 @@ class CPackedTri
 public:
 	uint32 V0, V1, V2;
 public:
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serial(V0, V1, V2);
 	}
@@ -79,7 +79,7 @@ class CPackedTri16
 public:
 	uint16 V0, V1, V2;
 public:
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serial(V0, V1, V2);
 	}
@@ -101,7 +101,7 @@ public:
 	sint32					    ZoneY;
 public:
 	virtual ~CPackedZoneBase() {}
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) = 0;
+	virtual void serial(NLMISC::IStream &f) = 0;
 	// TMP For debug : render position covered by a frustum
 	virtual void render(CVertexBuffer &vb, IDriver &drv, CMaterial &mat, CMaterial &wiredMaterial, const NLMISC::CMatrix &camMat, uint batchSize, const NLMISC::CVector localFrustCorners[8]) = 0;
 	// raytracing test
@@ -138,7 +138,7 @@ public:
 			   sint32	zoneX,
 			   sint32	zoneY
 			  );
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 	// TMP For debug : render porition covered by a frustum
 	void render(CVertexBuffer &vb, IDriver &drv, CMaterial &mat, CMaterial &wiredMaterial, const NLMISC::CMatrix &camMat, uint batchSize, const NLMISC::CVector localFrustCorners[8]);
 	// try to build a 16 bit version of this packed zone to save some more place
@@ -183,7 +183,7 @@ public:
 	NLMISC_DECLARE_CLASS(CPackedZone16)
 	CPackedZone16();
 	//
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 	// TMP For debug : render position covered by a frustum
 	void render(CVertexBuffer &vb, IDriver &drv, CMaterial &mat, CMaterial &wiredMaterial, const NLMISC::CMatrix &camMat, uint batchSize, const NLMISC::CVector localFrustCorners[8]);
 		// raytracing test
diff --git a/code/nel/include/nel/3d/particle_system.h b/code/nel/include/nel/3d/particle_system.h
index 50a8d8269..bd50514fc 100644
--- a/code/nel/include/nel/3d/particle_system.h
+++ b/code/nel/include/nel/3d/particle_system.h
@@ -84,7 +84,7 @@ public:
 			/// dtor
 			virtual ~CParticleSystem();
 			/// serialize this particle system
-			void serial(NLMISC::IStream &f)  throw(NLMISC::EStream);
+			void serial(NLMISC::IStream &f);
 			/** Merge this system with a system instanciated from the given shape
 			  * NB : This is for edition purpose, this is slow
 			  * \return true if the operation could be performed. It can fail when this cause the system the system to last forever,
diff --git a/code/nel/include/nel/3d/particle_system_process.h b/code/nel/include/nel/3d/particle_system_process.h
index 75aa6e0f1..0e52228ee 100644
--- a/code/nel/include/nel/3d/particle_system_process.h
+++ b/code/nel/include/nel/3d/particle_system_process.h
@@ -102,7 +102,7 @@ class CParticleSystemProcess : public NLMISC::IStreamable
 			* Everything is saved, except for the fontManager and the fontGenerator.
 			* They must be set again if the PSToolRender pass is used.
 			*/
-			virtual void			serial(NLMISC::IStream &f) throw(NLMISC::EStream) ;
+			virtual void			serial(NLMISC::IStream &f);
 		/// @}
 
 
diff --git a/code/nel/include/nel/3d/particle_system_shape.h b/code/nel/include/nel/3d/particle_system_shape.h
index a1c397975..c8fbc8a17 100644
--- a/code/nel/include/nel/3d/particle_system_shape.h
+++ b/code/nel/include/nel/3d/particle_system_shape.h
@@ -90,7 +90,7 @@ public:
 	// @}
 
 	/// serial the shape
-	virtual void	serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void	serial(NLMISC::IStream &f);
 	NLMISC_DECLARE_CLASS(CParticleSystemShape);
 
 
diff --git a/code/nel/include/nel/3d/ps_attrib.h b/code/nel/include/nel/3d/ps_attrib.h
index cd691e719..8a0dcdda6 100644
--- a/code/nel/include/nel/3d/ps_attrib.h
+++ b/code/nel/include/nel/3d/ps_attrib.h
@@ -202,7 +202,7 @@ public:
 	uint size() const { return _Size; }
 
 	/// serialization
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		if (f.isReading())
 		{
@@ -262,7 +262,7 @@ public:
 			CPSAttrib();
 
 			/// Serialization method
-			void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+			void serial(NLMISC::IStream &f);
 
 			// swap with another vector
 			void swap(CPSAttrib<T> &other);
@@ -429,7 +429,7 @@ void CPSAttrib<T>::remove(uint32 index)
 }
 
 template <typename T>
-void CPSAttrib<T>::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSAttrib<T>::serial(NLMISC::IStream &f)
 {
 	// version 4 to 5 => bug with size being > capacity
 	sint ver = f.serialVersion(5);
diff --git a/code/nel/include/nel/3d/ps_attrib_maker.h b/code/nel/include/nel/3d/ps_attrib_maker.h
index 56b393c2e..fb96cb86e 100644
--- a/code/nel/include/nel/3d/ps_attrib_maker.h
+++ b/code/nel/include/nel/3d/ps_attrib_maker.h
@@ -60,7 +60,7 @@ struct CPSInputType
 		uint32 UserParamNum;
 	};
 
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serialEnum(InputType);
 		switch(InputType)
@@ -124,7 +124,7 @@ public:
 		}
 
 		/// serialisation of the object. Derivers MUST call this, (if they use the attribute of this class at least)
-		virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+		virtual void serial(NLMISC::IStream &f)
 		{
 			f.serialVersion(1);
 			f.serial(_NbCycles);
diff --git a/code/nel/include/nel/3d/ps_attrib_maker_bin_op.h b/code/nel/include/nel/3d/ps_attrib_maker_bin_op.h
index f59d9c4e4..597b47457 100644
--- a/code/nel/include/nel/3d/ps_attrib_maker_bin_op.h
+++ b/code/nel/include/nel/3d/ps_attrib_maker_bin_op.h
@@ -103,7 +103,7 @@ public:
 									   uint32 srcStep = (1 << 16)
 									  ) const;
 
-		virtual void    serial		  (NLMISC::IStream &f) throw(NLMISC::EStream);
+		virtual void    serial		  (NLMISC::IStream &f);
 		virtual void    deleteElement (uint32 index);
 		virtual void    newElement	  (const CPSEmitterInfo &info);
 		virtual void	resize		  (uint32 capacity, uint32 nbPresentElements);
diff --git a/code/nel/include/nel/3d/ps_attrib_maker_bin_op_inline.h b/code/nel/include/nel/3d/ps_attrib_maker_bin_op_inline.h
index 339a52e7f..00d675e4e 100644
--- a/code/nel/include/nel/3d/ps_attrib_maker_bin_op_inline.h
+++ b/code/nel/include/nel/3d/ps_attrib_maker_bin_op_inline.h
@@ -729,7 +729,7 @@ inline void CPSAttribMakerBinOp<T>::makeN(CPSLocated *loc,
 
 //=================================================================================================================
 template <class T>
-inline void    CPSAttribMakerBinOp<T>::serial		  (NLMISC::IStream &f) throw(NLMISC::EStream)
+inline void    CPSAttribMakerBinOp<T>::serial		  (NLMISC::IStream &f)
 {
 	if (f.isReading())
 	{
diff --git a/code/nel/include/nel/3d/ps_attrib_maker_helper.h b/code/nel/include/nel/3d/ps_attrib_maker_helper.h
index 73ab32a31..2a4f243b6 100644
--- a/code/nel/include/nel/3d/ps_attrib_maker_helper.h
+++ b/code/nel/include/nel/3d/ps_attrib_maker_helper.h
@@ -96,7 +96,7 @@ template <typename T, class F> class CPSAttribMakerT : public CPSAttribMaker<T>
 
 
 		/// serialization of the object
-		virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+		virtual void serial(NLMISC::IStream &f)
 		{
 			sint ver = f.serialVersion(2);
 			CPSAttribMaker<T>::serial(f);
@@ -1624,7 +1624,7 @@ public:
 	}
 
 	/// serialisation of the object. Derivers MUST call this, (if they use the attribute of this class at least)
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	virtual void serial(NLMISC::IStream &f)
 	{
 
 		f.serialVersion(1);
@@ -1744,7 +1744,7 @@ public:
 		_MaxValue = other._MaxValue;
 	}
 	// serial. Should update min / max when reading
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 	virtual uint32 getMinValue(void) const { return _MinValue; }
 	virtual uint32 getMaxValue(void) const { return _MaxValue; }
 	virtual void newElement(const CPSEmitterInfo &info);
@@ -1767,7 +1767,7 @@ public:
 		_MaxValue = other._MaxValue;
 	}
 	// serial. Should update min / max when reading
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 	virtual sint32 getMinValue(void) const { return _MinValue; }
 	virtual sint32 getMaxValue(void) const { return _MaxValue; }
 	virtual void newElement(const CPSEmitterInfo &info);
@@ -1790,7 +1790,7 @@ public:
 		_MaxValue = other._MaxValue;
 	}
 	// serial. Should update min / max when reading
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 	virtual float getMinValue(void) const { return _MinValue; }
 	virtual float getMaxValue(void) const { return _MaxValue; }
 	virtual void newElement(const CPSEmitterInfo &info);
diff --git a/code/nel/include/nel/3d/ps_attrib_maker_template.h b/code/nel/include/nel/3d/ps_attrib_maker_template.h
index c41931ab3..86213880c 100644
--- a/code/nel/include/nel/3d/ps_attrib_maker_template.h
+++ b/code/nel/include/nel/3d/ps_attrib_maker_template.h
@@ -93,7 +93,7 @@ public:
 		CPSValueBlendFunc() {}
 
 		/// serialization
-		void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+		void serial(NLMISC::IStream &f)
 		{
 			f.serialVersion(1);
 			f.serial(_StartValue, _EndValue);
@@ -228,7 +228,7 @@ public:
 	CPSValueBlendSampleFunc() {}
 
 	/// serialization
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serialVersion(1);
 		if (f.isReading())
@@ -353,7 +353,7 @@ public:
 	}
 
 	/// serialization
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 
 
 	T getMaxValue(void) const
@@ -493,7 +493,7 @@ void CPSValueGradientFunc<T>::setValuesUnpacked(const T *valueTab, uint32 numVal
 
 
 template <typename T>
-void CPSValueGradientFunc<T>::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSValueGradientFunc<T>::serial(NLMISC::IStream &f)
 {
 	f.serialVersion(1);
 	f.serial(_NbStages);
diff --git a/code/nel/include/nel/3d/ps_color.h b/code/nel/include/nel/3d/ps_color.h
index d05d9cf11..1be8fb329 100644
--- a/code/nel/include/nel/3d/ps_color.h
+++ b/code/nel/include/nel/3d/ps_color.h
@@ -66,7 +66,7 @@ public:
 	{
 		CPSValueBlendFunc<NLMISC::CRGBA>::setValues(convertVBColor(startValue, _ColorType), convertVBColor(endValue, _ColorType));
 	}
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		setColorType(CVertexBuffer::TRGBA);
 		CPSValueBlendFunc<NLMISC::CRGBA>::serial(f);
@@ -100,7 +100,7 @@ public:
 	{
 		CPSValueBlendSampleFunc<NLMISC::CRGBA, RGBA_BLENDER_NUM_VALUES>::setValues(convertVBColor(startValue, _ColorType), convertVBColor(endValue, _ColorType));
 	}
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		setColorType(CVertexBuffer::TRGBA);
 		CPSValueBlendSampleFunc<NLMISC::CRGBA, RGBA_BLENDER_NUM_VALUES>::serial(f);
@@ -124,7 +124,7 @@ public:
 	NLMISC::CRGBA getValue(uint index)	const;
 	void setValues(const NLMISC::CRGBA *valueTab, uint32 numValues, uint32 nbStages);
 	void setValuesUnpacked(const NLMISC::CRGBA *valueTab, uint32 numValues, uint32 nbStages);
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		setColorType(CVertexBuffer::TRGBA);
 		CPSValueGradientFunc<NLMISC::CRGBA>::serial(f);
@@ -153,7 +153,7 @@ public:
 		this->_F.setColorType(colorType);
 	}
 	// serialisation should always be done in RGBA mode, so enforce that
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	virtual void serial(NLMISC::IStream &f)
 	{
 		setColorType(CVertexBuffer::TRGBA);
 		CPSAttribMakerT<NLMISC::CRGBA, F>::serial(f);
@@ -229,7 +229,7 @@ public:
 	virtual void setColorType(CVertexBuffer::TVertexColorType colorType);
 	virtual void setDefaultValue(NLMISC::CRGBA defaultValue);
 	virtual NLMISC::CRGBA getDefaultValue(void) const;
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 protected:
 	CVertexBuffer::TVertexColorType _ColorType;
 };
@@ -244,7 +244,7 @@ public:
 	NLMISC_DECLARE_CLASS(CPSColorBinOp);
 	CPSAttribMakerBase *clone() const { return new CPSColorBinOp(*this); }
 	virtual void setColorType(CVertexBuffer::TVertexColorType colorType);
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 };
 
 
diff --git a/code/nel/include/nel/3d/ps_dot.h b/code/nel/include/nel/3d/ps_dot.h
index d5201ab3b..2bdb7603a 100644
--- a/code/nel/include/nel/3d/ps_dot.h
+++ b/code/nel/include/nel/3d/ps_dot.h
@@ -46,7 +46,7 @@ public:
 	NLMISC_DECLARE_CLASS(CPSDot);
 
 	///serialisation
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 	/// return true if there are transparent faces in the object
 	virtual bool hasTransparentFaces(void);
diff --git a/code/nel/include/nel/3d/ps_emitter.h b/code/nel/include/nel/3d/ps_emitter.h
index 7170be75a..b8d82bb45 100644
--- a/code/nel/include/nel/3d/ps_emitter.h
+++ b/code/nel/include/nel/3d/ps_emitter.h
@@ -171,7 +171,7 @@ public:
 	const CPSAttribMaker<uint32>	*getGenNbScheme(void) const  { return _GenNbScheme; }
 
 	/// Serialization
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 	///\name Speed vector options
 	//@{
@@ -424,7 +424,7 @@ class CPSModulatedEmitter
 		bool useEmitteeSpeedScheme(void) const { return _EmitteeSpeedScheme != NULL; }
 
 		/// serialization
-		void serialEmitteeSpeedScheme(NLMISC::IStream &f) throw(NLMISC::EStream);
+		void serialEmitteeSpeedScheme(NLMISC::IStream &f);
 
 	protected:
 
@@ -470,7 +470,7 @@ public:
 	}
 
 	/// Serialisation
- 	virtual	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+ 	virtual	void serial(NLMISC::IStream &f);
 
 
 	NLMISC_DECLARE_CLASS(CPSEmitterDirectionnal);
@@ -506,7 +506,7 @@ class CPSRadialEmitter : public CPSEmitterDirectionnal
 		if (CParticleSystem::getSerializeIdentifierFlag()) _Name = std::string("RadialEmitter");
 	}
 	/// Serialisation
- 	virtual	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+ 	virtual	void serial(NLMISC::IStream &f);
 	NLMISC_DECLARE_CLASS(CPSRadialEmitter);
 	virtual void emit(const NLMISC::CVector &srcPos, uint32 index, NLMISC::CVector &pos, NLMISC::CVector &speed);
 };
@@ -527,7 +527,7 @@ public:
 	}
 
 	/// Serialisation
- 	virtual	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+ 	virtual	void serial(NLMISC::IStream &f);
 
 	NLMISC_DECLARE_CLASS(CPSEmitterOmni);
 
@@ -561,7 +561,7 @@ class CPSEmitterRectangle : public CPSEmitter, public CPSModulatedEmitter, publi
 		}
 
 		/// Serialisation
- 		virtual	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+ 		virtual	void serial(NLMISC::IStream &f);
 
 		NLMISC_DECLARE_CLASS(CPSEmitterRectangle);
 
@@ -636,7 +636,7 @@ public:
 	}
 
 	/// Serialisation
- 	virtual	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+ 	virtual	void serial(NLMISC::IStream &f);
 
 	NLMISC_DECLARE_CLASS(CPSEmitterConic);
 
@@ -675,7 +675,7 @@ public:
 	}
 
 	/// Serialisation
- 	virtual	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+ 	virtual	void serial(NLMISC::IStream &f);
 
 	NLMISC_DECLARE_CLASS(CPSSphericalEmitter);
 
diff --git a/code/nel/include/nel/3d/ps_face.h b/code/nel/include/nel/3d/ps_face.h
index b46299eb1..b62a9d50b 100644
--- a/code/nel/include/nel/3d/ps_face.h
+++ b/code/nel/include/nel/3d/ps_face.h
@@ -69,7 +69,7 @@ public:
 	 */
 	CPSFace(CSmartPtr<ITexture> tex = NULL);
 
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 	NLMISC_DECLARE_CLASS(CPSFace);
 	/** Tells that all faces are turning in the same manner, and only have a rotationnal bias
diff --git a/code/nel/include/nel/3d/ps_face_look_at.h b/code/nel/include/nel/3d/ps_face_look_at.h
index 3ae6a59e3..1d9b38a36 100644
--- a/code/nel/include/nel/3d/ps_face_look_at.h
+++ b/code/nel/include/nel/3d/ps_face_look_at.h
@@ -40,7 +40,7 @@ public:
 	 */
 	CPSFaceLookAt(CSmartPtr<ITexture> tex = NULL);
 
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 	NLMISC_DECLARE_CLASS(CPSFaceLookAt);
 
diff --git a/code/nel/include/nel/3d/ps_fan_light.h b/code/nel/include/nel/3d/ps_fan_light.h
index 19f5baaa5..1de8beaa9 100644
--- a/code/nel/include/nel/3d/ps_fan_light.h
+++ b/code/nel/include/nel/3d/ps_fan_light.h
@@ -47,7 +47,7 @@ public:
 	CPSFanLight(uint32 nbFans = 7);
 	/// Dtor
 	~CPSFanLight();
-	void				serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void				serial(NLMISC::IStream &f);
 	//@}
 
 	// Set the number of fans used for drawing (minimum is 3, maximum is 128)
diff --git a/code/nel/include/nel/3d/ps_float.h b/code/nel/include/nel/3d/ps_float.h
index da8978af1..be5044d2d 100644
--- a/code/nel/include/nel/3d/ps_float.h
+++ b/code/nel/include/nel/3d/ps_float.h
@@ -104,7 +104,7 @@ class CPSFloatCurveFunctor
 			CCtrlPoint(float date, float value) : Date(date), Value(value) { nlassert(Date >= 0 && Date <= 1); }
 			float Date;
 			float Value;
-			void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+			void serial(NLMISC::IStream &f)
 			{
 				f.serial(Date, Value);
 			}
@@ -166,7 +166,7 @@ class CPSFloatCurveFunctor
 		float							getValue(float date) const;
 
 		/// serialization
-		void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+		void serial(NLMISC::IStream &f);
 
 		float	getMinValue() const { return _MinValue; }
 		float	getMaxValue() const { return _MaxValue; }
diff --git a/code/nel/include/nel/3d/ps_force.h b/code/nel/include/nel/3d/ps_force.h
index e93c21361..14be72150 100644
--- a/code/nel/include/nel/3d/ps_force.h
+++ b/code/nel/include/nel/3d/ps_force.h
@@ -70,7 +70,7 @@ public:
 	virtual void		show() = 0;
 
 	/// Serial the force definition. MUST be called by deriver during their serialisation
-	virtual void		serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void		serial(NLMISC::IStream &f);
 
 	/// check whether this force is integrable over time. The default is false
 	virtual bool		isIntegrable(void) const { return false; }
@@ -175,7 +175,7 @@ public:
 	/// get the attribute maker for a non constant intensity
 	CPSAttribMaker<float> *getIntensityScheme(void) { return _IntensityScheme; }
 	const CPSAttribMaker<float> *getIntensityScheme(void) const { return _IntensityScheme; }
-	void serialForceIntensity(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serialForceIntensity(NLMISC::IStream &f);
 
 protected:
 
@@ -209,7 +209,7 @@ protected:
 class CPSForceIntensityHelper : public CPSForce, public CPSForceIntensity
 {
 public:
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream) ;
+	void serial(NLMISC::IStream &f);
 
 protected:
 	virtual CPSLocated *getForceIntensityOwner(void) { return _Owner; }
@@ -241,7 +241,7 @@ protected:
  *
  *      // you can provide a serialization method. Note that that if the functor parameters are set before each use,
  *      // it useless to serial something ...
- *		void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+ *		void serial(NLMISC::IStream &f)
  *
  *    protected:
  *      ...
@@ -275,7 +275,7 @@ public:
 
 
 	/// serialization
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	virtual void serial(NLMISC::IStream &f)
 	{
 		f.serialVersion(1);
 		CPSForce::serial(f);
@@ -354,7 +354,7 @@ class CPSDirectionnalForce : public CPSForceIntensityHelper, public CPSDirection
 	}
 
 	/// serialization
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 
 
 	NLMISC_DECLARE_CLASS(CPSDirectionnalForce);
@@ -397,7 +397,7 @@ public:
 	}
 
 	/// serialization
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 
 	NLMISC_DECLARE_CLASS(CPSGravity);
 
@@ -443,7 +443,7 @@ public:
 	}
 
 	/// serialization
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 
 
 	NLMISC_DECLARE_CLASS(CPSCentralGravity);
@@ -464,7 +464,7 @@ public:
 
 
 	/// serialization
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 
 
 	/// Compute the force on the targets
@@ -498,7 +498,7 @@ public:
 		speed -= (CParticleSystem::EllapsedTime * _K * invMass * speed);
 	}
 
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	virtual void serial(NLMISC::IStream &f)
 	{
 		f.serialVersion(1);
 		// we don't save intensity info : it is saved by the owning object (and set before each use of this functor)
@@ -539,7 +539,7 @@ public:
 	NLMISC_DECLARE_CLASS(CPSFluidFriction)
 
 
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	virtual void serial(NLMISC::IStream &f)
 	{
 		f.serialVersion(1);
 		CIsotropicForceT<CPSFluidFrictionFunctor>::serial(f);
@@ -571,7 +571,7 @@ public:
 
 	NLMISC_DECLARE_CLASS(CPSBrownianForce)
 
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 
 	/// We provide a kind of integration on a predefined sequence
 	virtual bool		 isIntegrable(void) const;
@@ -648,7 +648,7 @@ struct CPSTurbulForceFunc
 						 */
 	}
 
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	virtual void serial(NLMISC::IStream &f)
 	 {
 		f.serialVersion(1);
 		f.serial(_Scale, _NumOctaves);
@@ -686,7 +686,7 @@ public:
 
 	NLMISC_DECLARE_CLASS(CPSTurbul)
 
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	virtual void serial(NLMISC::IStream &f)
 	{
 		f.serialVersion(1);
 		CIsotropicForceT<CPSTurbulForceFunc>::serial(f);
@@ -758,7 +758,7 @@ public:
 
 
 	// serialization
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 
 
 
@@ -801,7 +801,7 @@ class CPSMagneticForce : public CPSDirectionnalForce
 	}
 	virtual void computeForces(CPSLocated &target);
 	/// serialization
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 	NLMISC_DECLARE_CLASS(CPSMagneticForce);
 };
 
diff --git a/code/nel/include/nel/3d/ps_light.h b/code/nel/include/nel/3d/ps_light.h
index 31e159ae1..016dddaf9 100644
--- a/code/nel/include/nel/3d/ps_light.h
+++ b/code/nel/include/nel/3d/ps_light.h
@@ -42,7 +42,7 @@ public:
 	~CPSLight();
 	NLMISC_DECLARE_CLASS(CPSLight);
 	/// Serialisation. Derivers must override this, and call their parent version
-	virtual void			serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void			serial(NLMISC::IStream &f);
 	//@}
 	virtual uint32			getType(void) const;
 	virtual uint32			getPriority(void) const { return 600; }
diff --git a/code/nel/include/nel/3d/ps_located.h b/code/nel/include/nel/3d/ps_located.h
index 4245c5c81..e8bd62a20 100644
--- a/code/nel/include/nel/3d/ps_located.h
+++ b/code/nel/include/nel/3d/ps_located.h
@@ -356,7 +356,7 @@ public:
 	void resize(uint32 newSize);
 
 	/// serialization
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 	/// Shortcut to get an instance of the 3d driver
 	IDriver *getDriver() const;
@@ -730,7 +730,7 @@ public:
 		/// ctor
 		CPSLocatedBindable();
 		/// serialization
-		virtual void		serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+		virtual void		serial(NLMISC::IStream &f);
 		/** this should be called before to delete any bindable inserted in a system, but this is done
 		  * by the system, so you should never need calling it. This has been introduced because calls in dtor are not polymorphic
 		  * to derived class (which are already destroyed anyway), and some infos are needed in some dtor. The default behaviour does nothing
@@ -1010,7 +1010,7 @@ public:
 	 */
 	virtual void		releaseTargetRsc(CPSLocated * /* target */) {}
 	/// Seralization, must be called by derivers
-	void				serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void				serial(NLMISC::IStream &f);
 	/// Finalize this object : the default is to call releaseTargetRsc on targets
 	virtual void		finalize(void);
 	virtual				~CPSTargetLocatedBindable();
diff --git a/code/nel/include/nel/3d/ps_mesh.h b/code/nel/include/nel/3d/ps_mesh.h
index 6863903f9..7eef01012 100644
--- a/code/nel/include/nel/3d/ps_mesh.h
+++ b/code/nel/include/nel/3d/ps_mesh.h
@@ -82,7 +82,7 @@ public:
 	std::string getShape(void) const { return _Shape; }
 
 		/// serialisation. Derivers must override this, and call their parent version
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 
 	virtual ~CPSMesh();
 
@@ -271,7 +271,7 @@ public:
 
 
 	/// serialisation. Derivers must override this, and call their parent version
-	virtual void		serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void		serial(NLMISC::IStream &f);
 
 
 	NLMISC_DECLARE_CLASS(CPSConstraintMesh);
@@ -334,7 +334,7 @@ public:
 			float			  WRotSpeed;  /* = 0 */
 			float			  WRotAccel;  /* = 0 */
 			CGlobalTexAnim();
-			void	serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+			void	serial(NLMISC::IStream &f);
 			/// Build a texture matrix from a date and this obj.
 			void    buildMatrix(TAnimationTime date, NLMISC::CMatrix &dest);
 		};
@@ -587,7 +587,7 @@ protected:
 	struct CGlobalTexAnims
 	{
 		CGlobalTexAnim		Anims[IDRV_MAT_MAXTEXTURES];
-		void	serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+		void	serial(NLMISC::IStream &f);
 	};
 
 	typedef CUniquePtr<CGlobalTexAnims> PGlobalTexAnims;
diff --git a/code/nel/include/nel/3d/ps_particle_basic.h b/code/nel/include/nel/3d/ps_particle_basic.h
index 3674e6d9c..c7bdc242a 100644
--- a/code/nel/include/nel/3d/ps_particle_basic.h
+++ b/code/nel/include/nel/3d/ps_particle_basic.h
@@ -107,7 +107,7 @@ public:
 	virtual uint32 getNumWantedTris() const = 0;
 
 	/// serialisation. Derivers must override this, and call their parent version
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	virtual void serial(NLMISC::IStream &f)
 	{
 		/// version 3 : global color lighting
 		/// version 2 : auto-lod saved
@@ -210,7 +210,7 @@ class CPSColoredParticle
 		virtual ~CPSColoredParticle();
 
 		/// serialization.
-		void serialColorScheme(NLMISC::IStream &f) throw(NLMISC::EStream);
+		void serialColorScheme(NLMISC::IStream &f);
 
 	protected:
 
@@ -273,7 +273,7 @@ class CPSSizedParticle
 		virtual ~CPSSizedParticle();
 
 		/// serialization. We choose a different name because of multiple-inheritance
-		void serialSizeScheme(NLMISC::IStream &f) throw(NLMISC::EStream);
+		void serialSizeScheme(NLMISC::IStream &f);
 
 	protected:
 
@@ -335,7 +335,7 @@ class CPSRotated2DParticle
 		virtual ~CPSRotated2DParticle();
 
 		/// serialization. We choose a different name because of multiple-inheritance
-		void serialAngle2DScheme(NLMISC::IStream &f) throw(NLMISC::EStream);
+		void serialAngle2DScheme(NLMISC::IStream &f);
 
 
 
@@ -453,7 +453,7 @@ class CPSTexturedParticle
 		virtual ~CPSTexturedParticle();
 
 		/// serialization. We choose a different name because of multiple-inheritance
-		void serialTextureScheme(NLMISC::IStream &f) throw(NLMISC::EStream);
+		void serialTextureScheme(NLMISC::IStream &f);
 
 		void			enumTexs(std::vector<NLMISC::CSmartPtr<ITexture> > &dest);
 
@@ -576,7 +576,7 @@ public:
 	}
 
 	/// serial this object
-	void serialMultiTex(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serialMultiTex(NLMISC::IStream &f);
 
 	/** setup a material from this object and a primary texture
 	  * drv is used to check the device caps.
@@ -683,7 +683,7 @@ class CPSRotated3DPlaneParticle
 		virtual ~CPSRotated3DPlaneParticle();
 
 		/// serialization. We choose a different name because of multiple-inheritance
-		void serialPlaneBasisScheme(NLMISC::IStream &f) throw(NLMISC::EStream);
+		void serialPlaneBasisScheme(NLMISC::IStream &f);
 
 	protected:
 		/// if this is false, constant size will be used instead of a scheme
@@ -806,7 +806,7 @@ public:
 	enum TBlendingMode { add, modulate, alphaBlend, alphaTest };
 
 	/// serialization (not named 'serial' because it will be used via multiple-inheritance)
-	void serialMaterial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serialMaterial(NLMISC::IStream &f);
 
 	/// set the blending mode. The default is ass
 	void setBlendingMode(CPSMaterial::TBlendingMode mode);
diff --git a/code/nel/include/nel/3d/ps_plane_basis.h b/code/nel/include/nel/3d/ps_plane_basis.h
index 41882e148..3a36876f7 100644
--- a/code/nel/include/nel/3d/ps_plane_basis.h
+++ b/code/nel/include/nel/3d/ps_plane_basis.h
@@ -66,7 +66,7 @@ struct CPlaneBasis
 	}
 
 
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serial(X, Y) ;
 	}
diff --git a/code/nel/include/nel/3d/ps_plane_basis_maker.h b/code/nel/include/nel/3d/ps_plane_basis_maker.h
index 54770c9c9..e798c9885 100644
--- a/code/nel/include/nel/3d/ps_plane_basis_maker.h
+++ b/code/nel/include/nel/3d/ps_plane_basis_maker.h
@@ -128,7 +128,7 @@ class CPSPlaneBasisFollowSpeed : public CPSAttribMaker<CPlaneBasis>
 		NLMISC_DECLARE_CLASS(CPSPlaneBasisFollowSpeed);
 
 		/// serialization
-		virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+		virtual void serial(NLMISC::IStream &f)
 		{
 			// version 2 : added projection plane
 			// version 1 : nothing to save here
@@ -192,7 +192,7 @@ public:
 	/// get the number of samples for the rotation
 	uint32 getNumSamples(void) const;
 	/// serial this object
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 protected:
 	CPSVector<CPlaneBasis>::V   _PBTab;
 	uint32						_NbSamples;
diff --git a/code/nel/include/nel/3d/ps_quad.h b/code/nel/include/nel/3d/ps_quad.h
index 000ff32cc..76e9562e2 100644
--- a/code/nel/include/nel/3d/ps_quad.h
+++ b/code/nel/include/nel/3d/ps_quad.h
@@ -114,7 +114,7 @@ protected:
 	void updateVbColNUVForRender(CVertexBuffer &vb, uint32 startIndex, uint32 numQuad, uint32 srcStep, IDriver &drv);
 
 	/// DERIVERS MUST CALL this
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 	virtual CPSLocated *getColorOwner(void) { return _Owner; }
 	virtual CPSLocated *getSizeOwner(void) { return _Owner; }
 	virtual CPSLocated *getTextureIndexOwner(void) { return _Owner; }
diff --git a/code/nel/include/nel/3d/ps_ribbon.h b/code/nel/include/nel/3d/ps_ribbon.h
index ccda62021..5383a1b4b 100644
--- a/code/nel/include/nel/3d/ps_ribbon.h
+++ b/code/nel/include/nel/3d/ps_ribbon.h
@@ -55,7 +55,7 @@ public:
 		/// dtor
 		~CPSRibbon();
 		/// serialisation. Derivers must override this, and call their parent version
-		virtual void		serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+		virtual void		serial(NLMISC::IStream &f);
 		//
 		NLMISC_DECLARE_CLASS(CPSRibbon);
 	///@}
diff --git a/code/nel/include/nel/3d/ps_ribbon_base.h b/code/nel/include/nel/3d/ps_ribbon_base.h
index ea3443060..5670a2d31 100644
--- a/code/nel/include/nel/3d/ps_ribbon_base.h
+++ b/code/nel/include/nel/3d/ps_ribbon_base.h
@@ -52,7 +52,7 @@ public:
 	///@{
 		CPSRibbonBase();
 		/// serialisation. Derivers must override this, and call their parent version
-		virtual void			serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+		virtual void			serial(NLMISC::IStream &f);
 	///@}
 
 	///\name Behaviour
diff --git a/code/nel/include/nel/3d/ps_ribbon_look_at.h b/code/nel/include/nel/3d/ps_ribbon_look_at.h
index 2494fe04c..6da38694b 100644
--- a/code/nel/include/nel/3d/ps_ribbon_look_at.h
+++ b/code/nel/include/nel/3d/ps_ribbon_look_at.h
@@ -38,7 +38,7 @@ public:
 		/// dtor
 		~CPSRibbonLookAt();
 		/// serialisation. Derivers must override this, and call their parent version
-		virtual void		serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+		virtual void		serial(NLMISC::IStream &f);
 		//
 		NLMISC_DECLARE_CLASS(CPSRibbonLookAt);
 	///@}
diff --git a/code/nel/include/nel/3d/ps_shockwave.h b/code/nel/include/nel/3d/ps_shockwave.h
index b8329a239..54774c58f 100644
--- a/code/nel/include/nel/3d/ps_shockwave.h
+++ b/code/nel/include/nel/3d/ps_shockwave.h
@@ -54,7 +54,7 @@ public:
 	float getRadiusCut(void) const { return _RadiusCut; }
 
 	/// serialisation. Derivers must override this, and call their parent version
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 
 	NLMISC_DECLARE_CLASS(CPSShockWave);
 
diff --git a/code/nel/include/nel/3d/ps_sound.h b/code/nel/include/nel/3d/ps_sound.h
index af5a7cc94..d1c990770 100644
--- a/code/nel/include/nel/3d/ps_sound.h
+++ b/code/nel/include/nel/3d/ps_sound.h
@@ -50,7 +50,7 @@ public:
 	/// dtor
 								~CPSSound();
 	/// serialisation. Derivers must override this, and call their parent version
-	virtual void				serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void				serial(NLMISC::IStream &f);
 	//@}
 
 	/// return this bindable type
diff --git a/code/nel/include/nel/3d/ps_tail_dot.h b/code/nel/include/nel/3d/ps_tail_dot.h
index 3caf5fa96..a2aae6e83 100644
--- a/code/nel/include/nel/3d/ps_tail_dot.h
+++ b/code/nel/include/nel/3d/ps_tail_dot.h
@@ -37,7 +37,7 @@ public:
 		/// dtor
 		~CPSTailDot();
 		/// serialisation. Derivers must override this, and call their parent version
-		virtual void		serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+		virtual void		serial(NLMISC::IStream &f);
 		//
 		NLMISC_DECLARE_CLASS(CPSTailDot);
 	///@}
diff --git a/code/nel/include/nel/3d/ps_zone.h b/code/nel/include/nel/3d/ps_zone.h
index 0e0ff7274..032d5db62 100644
--- a/code/nel/include/nel/3d/ps_zone.h
+++ b/code/nel/include/nel/3d/ps_zone.h
@@ -82,7 +82,7 @@ public:
 
 
 	/// serialization, DERIVER must override this, and call the parent version
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 
 
 	/** Inherited from CPSTargetLocatedBindable. It's called when one of the targets has been detroyed or detached
@@ -155,7 +155,7 @@ class CPSZonePlane : public CPSZone, public IPSMover
 		virtual NLMISC::CVector getNormal(uint32 index);
 		virtual void setNormal(uint32 index, NLMISC::CVector n);
 
-		virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+		virtual void serial(NLMISC::IStream &f);
 
 	protected:
 		TPSAttribVector _Normal;
@@ -176,7 +176,7 @@ struct CRadiusPair
 {
 	// the adius, and the square radius
 	float R, R2;
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serial(R, R2);
 	}
@@ -205,7 +205,7 @@ class CPSZoneSphere : public CPSZone, public IPSMover
 
 
 
-		virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+		virtual void serial(NLMISC::IStream &f);
 
 
 		// inherited from IPSMover
@@ -257,7 +257,7 @@ class CPSZoneDisc : public CPSZone, public IPSMover
 		virtual NLMISC::CVector getNormal(uint32 index);
 		virtual void setNormal(uint32 index, NLMISC::CVector n);
 
-		virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+		virtual void serial(NLMISC::IStream &f);
 
 
 
@@ -303,7 +303,7 @@ class CPSZoneCylinder : public CPSZone, public IPSMover
 		virtual NLMISC::CVector getScale(uint32 k) const;
 
 		// serialization
-		virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+		virtual void serial(NLMISC::IStream &f);
 
 
 
@@ -350,7 +350,7 @@ class CPSZoneRectangle : public CPSZone, public IPSMover
 
 
 		// serialization
-		virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+		virtual void serial(NLMISC::IStream &f);
 
 		// inherited from IPSMover
 		virtual bool supportUniformScaling(void) const { return true; }
diff --git a/code/nel/include/nel/3d/seg_remanence_shape.h b/code/nel/include/nel/3d/seg_remanence_shape.h
index 80d54b6ca..2f8a159ff 100644
--- a/code/nel/include/nel/3d/seg_remanence_shape.h
+++ b/code/nel/include/nel/3d/seg_remanence_shape.h
@@ -70,7 +70,7 @@ public:
 		// assignement
 		CSegRemanenceShape &operator = (const CSegRemanenceShape &other);
 
-		virtual void	serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+		virtual void	serial(NLMISC::IStream &f);
 		NLMISC_DECLARE_CLASS(CSegRemanenceShape);
 	//@}
 
diff --git a/code/nel/include/nel/3d/shape.h b/code/nel/include/nel/3d/shape.h
index a8038e593..ec359aa7f 100644
--- a/code/nel/include/nel/3d/shape.h
+++ b/code/nel/include/nel/3d/shape.h
@@ -201,7 +201,7 @@ public:
 	IShape*						getShapePointer () const;
 
 	/// serial the shape.
-	virtual void				serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void				serial(NLMISC::IStream &f);
 private:
 	IShape*			_Shape;
 };
diff --git a/code/nel/include/nel/3d/skeleton_shape.h b/code/nel/include/nel/3d/skeleton_shape.h
index a47be7f17..359a51fd3 100644
--- a/code/nel/include/nel/3d/skeleton_shape.h
+++ b/code/nel/include/nel/3d/skeleton_shape.h
@@ -49,7 +49,7 @@ public:
 		std::vector<uint8>	ActiveBones;
 
 	public:
-		void	serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+		void	serial(NLMISC::IStream &f);
 	};
 
 public:
@@ -94,7 +94,7 @@ public:
 	virtual float	getNumTriangles (float distance);
 
 	/// serial this skeletonshape.
-	virtual void	serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void	serial(NLMISC::IStream &f);
 	NLMISC_DECLARE_CLASS(CSkeletonShape);
 
 	/// flush textures used by this shape.
diff --git a/code/nel/include/nel/3d/texture.h b/code/nel/include/nel/3d/texture.h
index 88ef247e6..bd71a00fd 100644
--- a/code/nel/include/nel/3d/texture.h
+++ b/code/nel/include/nel/3d/texture.h
@@ -359,7 +359,7 @@ public:
 	virtual bool allowDegradation() const { return false; }
 
 	/// serial ITexture basic infos (clamp ...).
-	virtual void	serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void	serial(NLMISC::IStream &f);
 
 	/** Select a texture among several other (if this texture is a set of texture such as CTextureMultiFile)
 	  * The default does nothing
diff --git a/code/nel/include/nel/3d/texture_blend.h b/code/nel/include/nel/3d/texture_blend.h
index 7a910d91e..5dcc7c6ea 100644
--- a/code/nel/include/nel/3d/texture_blend.h
+++ b/code/nel/include/nel/3d/texture_blend.h
@@ -74,7 +74,7 @@ public:
 	virtual void release();
 
 	// serial this texture datas
-	virtual void	serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void	serial(NLMISC::IStream &f);
 
 private:
 	uint16						_BlendFactor;
diff --git a/code/nel/include/nel/3d/texture_bump.h b/code/nel/include/nel/3d/texture_bump.h
index 7e4a099c9..1fb6152de 100644
--- a/code/nel/include/nel/3d/texture_bump.h
+++ b/code/nel/include/nel/3d/texture_bump.h
@@ -47,7 +47,7 @@ public:
 	const ITexture		*getHeightMap() const { return _HeightMap; };
 
 	// serial this texture datas
-	virtual void	serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void	serial(NLMISC::IStream &f);
 
 	virtual bool			supportSharing() const;
 
diff --git a/code/nel/include/nel/3d/texture_cube.h b/code/nel/include/nel/3d/texture_cube.h
index 979defa1c..4958f6628 100644
--- a/code/nel/include/nel/3d/texture_cube.h
+++ b/code/nel/include/nel/3d/texture_cube.h
@@ -77,7 +77,7 @@ public:
 	virtual bool isTextureCube() const { return true; }
 
 	/// Save the texture file name.
-	virtual void	serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void	serial(NLMISC::IStream &f);
 	NLMISC_DECLARE_CLASS(CTextureCube);
 
 	/// If the face support multiple texture (such has CTextureMultiFile), this allow to select the active set
diff --git a/code/nel/include/nel/3d/texture_dlm.h b/code/nel/include/nel/3d/texture_dlm.h
index 18cf125a0..0c16d95f6 100644
--- a/code/nel/include/nel/3d/texture_dlm.h
+++ b/code/nel/include/nel/3d/texture_dlm.h
@@ -81,7 +81,7 @@ public:
 	/// TextureDLM are system. Do not need to serialize them...
 	// default ctor is required for compilation with NLMISC_DECLARE_CLASS, but never called...
 	CTextureDLM() {nlstop;}
-	virtual void	serial(NLMISC::IStream &/* f */) throw(NLMISC::EStream) {nlstop;}
+	virtual void	serial(NLMISC::IStream &/* f */) {nlstop;}
 	NLMISC_DECLARE_CLASS(CTextureDLM);
 
 
diff --git a/code/nel/include/nel/3d/texture_emboss.h b/code/nel/include/nel/3d/texture_emboss.h
index cdab6d648..fed99f52a 100644
--- a/code/nel/include/nel/3d/texture_emboss.h
+++ b/code/nel/include/nel/3d/texture_emboss.h
@@ -46,7 +46,7 @@ public:
 	const ITexture		*getHeightMap() const { return _HeightMap; };
 
 	// serial this texture datas
-	virtual void			serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void			serial(NLMISC::IStream &f);
 	virtual bool			supportSharing() const;
 	virtual std::string		getShareName() const;
 	//
diff --git a/code/nel/include/nel/3d/texture_far.h b/code/nel/include/nel/3d/texture_far.h
index a55308b19..6fdb59f30 100644
--- a/code/nel/include/nel/3d/texture_far.h
+++ b/code/nel/include/nel/3d/texture_far.h
@@ -185,7 +185,7 @@ private:
 	void rebuildPatch  (const CVector2s texturePos, const CPatchIdent &pid);
 
 	/// From IStreamable
-	virtual void	serial(NLMISC::IStream &/* f */) throw(NLMISC::EStream) {}
+	virtual void	serial(NLMISC::IStream &/* f */) {}
 
 	// Some static buffers
 	static NLMISC::CRGBA	_LightmapExpanded[];
diff --git a/code/nel/include/nel/3d/texture_file.h b/code/nel/include/nel/3d/texture_file.h
index c758b1d6c..6f3620f47 100644
--- a/code/nel/include/nel/3d/texture_file.h
+++ b/code/nel/include/nel/3d/texture_file.h
@@ -122,7 +122,7 @@ public:
 	void doGenerate(bool async = false);
 
 	/// Save the texture file name.
-	virtual void	serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void	serial(NLMISC::IStream &f);
 	NLMISC_DECLARE_CLASS(CTextureFile);
 
 
diff --git a/code/nel/include/nel/3d/texture_font.h b/code/nel/include/nel/3d/texture_font.h
index 20353f236..e743bb137 100644
--- a/code/nel/include/nel/3d/texture_font.h
+++ b/code/nel/include/nel/3d/texture_font.h
@@ -112,7 +112,7 @@ private:
 
 	/// Todo: serialize a font texture.
 public:
-	virtual void	serial(NLMISC::IStream &/* f */) throw(NLMISC::EStream) {nlstop;}
+	virtual void	serial(NLMISC::IStream &/* f */) {nlstop;}
 	NLMISC_DECLARE_CLASS(CTextureFont);
 
 };
diff --git a/code/nel/include/nel/3d/texture_grouped.h b/code/nel/include/nel/3d/texture_grouped.h
index 247dd455a..f6f9515a0 100644
--- a/code/nel/include/nel/3d/texture_grouped.h
+++ b/code/nel/include/nel/3d/texture_grouped.h
@@ -111,7 +111,7 @@ public:
 	void doGenerate(bool async = false);
 
 	/// serialization
-	virtual void	serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void	serial(NLMISC::IStream &f);
 
 
 	/// a group of 4 uvs
diff --git a/code/nel/include/nel/3d/texture_mem.h b/code/nel/include/nel/3d/texture_mem.h
index 01ea393f1..d28218151 100644
--- a/code/nel/include/nel/3d/texture_mem.h
+++ b/code/nel/include/nel/3d/texture_mem.h
@@ -160,7 +160,7 @@ public:
 	void			setAllowDegradation(bool allow);
 
 	/// Todo: serialize a mem texture.
-	virtual void	serial(NLMISC::IStream &/* f */) throw(NLMISC::EStream) {nlstop;}
+	virtual void	serial(NLMISC::IStream &/* f */) {nlstop;}
 	NLMISC_DECLARE_CLASS(CTextureMem);
 
 	/** This create a white square texture of 1x1
diff --git a/code/nel/include/nel/3d/texture_multi_file.h b/code/nel/include/nel/3d/texture_multi_file.h
index 37549b997..a32207995 100644
--- a/code/nel/include/nel/3d/texture_multi_file.h
+++ b/code/nel/include/nel/3d/texture_multi_file.h
@@ -70,7 +70,7 @@ public:
 	/// Generate the current selected texture, looking in CPath if necessary.
 	virtual void			doGenerate(bool async = false);
 	/// Serial this object
-	virtual void			serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void			serial(NLMISC::IStream &f);
 	NLMISC_DECLARE_CLASS(CTextureMultiFile);
 
 private:
diff --git a/code/nel/include/nel/3d/texture_near.h b/code/nel/include/nel/3d/texture_near.h
index 5a124b53b..0c47ecec7 100644
--- a/code/nel/include/nel/3d/texture_near.h
+++ b/code/nel/include/nel/3d/texture_near.h
@@ -77,7 +77,7 @@ public:
 	/// TextureNear are system. Do not need to serialize them...
 	// default ctor is required for compilation with NLMISC_DECLARE_CLASS, but never called...
 	CTextureNear() {nlstop;}
-	virtual void	serial(NLMISC::IStream &/* f */) throw(NLMISC::EStream) {nlstop;}
+	virtual void	serial(NLMISC::IStream &/* f */) {nlstop;}
 	NLMISC_DECLARE_CLASS(CTextureNear);
 
 private:
diff --git a/code/nel/include/nel/3d/tile_bank.h b/code/nel/include/nel/3d/tile_bank.h
index 1205c5940..7d4eda3a7 100644
--- a/code/nel/include/nel/3d/tile_bank.h
+++ b/code/nel/include/nel/3d/tile_bank.h
@@ -77,7 +77,7 @@ public:
 	{
 		return (_Flags&NL3D_CTILE_FREE_FLAG)!=0;
 	}
-	void    serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	void    serial(NLMISC::IStream &f);
 	void setFileName (TBitmap bitmapType, const std::string& name)
 	{
 		// not free
@@ -180,7 +180,7 @@ public:
 
 	void clear(){ _TileSet.clear(); }
 
-	void    serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	void    serial(NLMISC::IStream &f);
 private:
 
 	// internal use
@@ -210,7 +210,7 @@ public:
 	{
 		return _Tile;
 	}
-	void    serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	void    serial(NLMISC::IStream &f);
 
 private:
 	sint32	_Tile;
@@ -236,7 +236,7 @@ public:
 	void doubleSize ();
 	bool operator== (const CTileBorder& border) const;
 	void operator= (const CTileBorder& border);
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 	bool isSet() const
 	{
 		return _Set;
@@ -416,7 +416,7 @@ public:
 	{
 		return _ChildName.find(name)!=_ChildName.end();
 	}
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 private:
 	static TFlagBorder getComplementaryBorder (TFlagBorder border);
 
@@ -629,7 +629,7 @@ public:
 	/// Postfix tile vegetable desc
 	void	postfixTileVegetableDesc (const char *filename);
 
-	void    serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	void    serial(NLMISC::IStream &f);
 private:
 	sint	createTile ();
 	void	freeTile (int tileIndex);
diff --git a/code/nel/include/nel/3d/tile_far_bank.h b/code/nel/include/nel/3d/tile_far_bank.h
index 35c04be8b..52f380439 100644
--- a/code/nel/include/nel/3d/tile_far_bank.h
+++ b/code/nel/include/nel/3d/tile_far_bank.h
@@ -94,7 +94,7 @@ public:
 		}
 
 		/// Serial this tile
-		void				serial (class NLMISC::IStream &f) throw(NLMISC::EStream);
+		void				serial (NLMISC::IStream &f);
 
 	private:
 		/// RGBA Pixels vector
@@ -141,7 +141,7 @@ public:
 	}
 
 	/// Serial this bank
-	void    serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	void    serial(NLMISC::IStream &f);
 
 	/// The far tile vector
 	std::vector<CTileFar>	_TileVector;
diff --git a/code/nel/include/nel/3d/track.h b/code/nel/include/nel/3d/track.h
index e3c88f800..1ef8a4f1e 100644
--- a/code/nel/include/nel/3d/track.h
+++ b/code/nel/include/nel/3d/track.h
@@ -166,7 +166,7 @@ public:
 
 
 	/// Serial the template
-	virtual void serial (NLMISC::IStream& f) throw (NLMISC::EStream)
+	virtual void serial (NLMISC::IStream& f)
 	{
 		// Serial version
 		(void)f.serialVersion (0);
@@ -217,7 +217,7 @@ public:
 
 
 	/// Serial the template
-	virtual void serial (NLMISC::IStream& f) throw (NLMISC::EStream)
+	virtual void serial (NLMISC::IStream& f)
 	{
 		// Serial version
 		(void)f.serialVersion (0);
diff --git a/code/nel/include/nel/3d/track_keyframer.h b/code/nel/include/nel/3d/track_keyframer.h
index 6cfb6736a..c49e63404 100644
--- a/code/nel/include/nel/3d/track_keyframer.h
+++ b/code/nel/include/nel/3d/track_keyframer.h
@@ -237,7 +237,7 @@ public:
 
 
 	/// Serial the template
-	virtual void serial (NLMISC::IStream& f) throw (NLMISC::EStream)
+	virtual void serial (NLMISC::IStream& f)
 	{
 		// Serial version
 		(void)f.serialVersion (0);
diff --git a/code/nel/include/nel/3d/water_height_map.h b/code/nel/include/nel/3d/water_height_map.h
index dcd38d90d..003aaac53 100644
--- a/code/nel/include/nel/3d/water_height_map.h
+++ b/code/nel/include/nel/3d/water_height_map.h
@@ -168,7 +168,7 @@ public:
 	sint64					Date;
 
 	/// serial the pools data's
-	void					serial(NLMISC::IStream &f)  throw(NLMISC::EStream);
+	void					serial(NLMISC::IStream &f);
 
 	/// Set this pool name.
 	void					setName(const std::string &name) { _Name = name; }
diff --git a/code/nel/include/nel/3d/water_pool_manager.h b/code/nel/include/nel/3d/water_pool_manager.h
index 569b5d59a..c8a0885c9 100644
--- a/code/nel/include/nel/3d/water_pool_manager.h
+++ b/code/nel/include/nel/3d/water_pool_manager.h
@@ -97,7 +97,7 @@ public:
 
 
 	/// serial the pools data's
-	void serial(NLMISC::IStream &f)  throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 private:
 	friend class CWaterShape;
diff --git a/code/nel/include/nel/3d/water_shape.h b/code/nel/include/nel/3d/water_shape.h
index dc7f20426..633da8611 100644
--- a/code/nel/include/nel/3d/water_shape.h
+++ b/code/nel/include/nel/3d/water_shape.h
@@ -108,7 +108,7 @@ public:
 
 
 	/// serial this shape
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 	//@}
 
 
@@ -299,7 +299,7 @@ public:
 
 
 		/// serial this shape
-		void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+		void serial(NLMISC::IStream &f);
 	//@}
 
 
diff --git a/code/nel/include/nel/logic/logic_condition.h b/code/nel/include/nel/logic/logic_condition.h
index bb2af30ce..30c9d7c08 100644
--- a/code/nel/include/nel/logic/logic_condition.h
+++ b/code/nel/include/nel/logic/logic_condition.h
@@ -79,7 +79,7 @@ public:
 	/**
 	 * serial
 	 */
-	//void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	//void serial(NLMISC::IStream &f);
 
 	void write (xmlNodePtr node) const;
 	void read (xmlNodePtr node);
@@ -160,7 +160,7 @@ public:
 	/**
 	 * serial
 	 */
-	//void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	//void serial(NLMISC::IStream &f);
 
 	void write (xmlNodePtr node) const;
 	void read (xmlNodePtr node);
@@ -239,7 +239,7 @@ public:
 	/**
 	 * serial
 	 */
-	//void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	//void serial(NLMISC::IStream &f);
 
 	/**
 	 * Destructor
@@ -323,7 +323,7 @@ public:
 	/**
 	 * serial
 	 */
-	//void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	//void serial(NLMISC::IStream &f);
 
 	void write (xmlNodePtr node) const;
 	void read (xmlNodePtr node);
diff --git a/code/nel/include/nel/logic/logic_event.h b/code/nel/include/nel/logic/logic_event.h
index 66c125260..9f15d2f34 100644
--- a/code/nel/include/nel/logic/logic_event.h
+++ b/code/nel/include/nel/logic/logic_event.h
@@ -79,7 +79,7 @@ public:
 	/**
 	 * serial
 	 */
-	//void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	//void serial(NLMISC::IStream &f);
 
 	void write (xmlNodePtr node, const char *subName = "") const;
 	void read (xmlNodePtr node, const char *subName = "");
@@ -122,7 +122,7 @@ public:
 	/**
 	 * serial
 	 */
-	//void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	//void serial(NLMISC::IStream &f);
 
 	void write (xmlNodePtr node) const;
 	void read (xmlNodePtr node);
@@ -181,7 +181,7 @@ public:
 	/**
 	 * serial
 	 */
-	//void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	//void serial(NLMISC::IStream &f);
 
 	void write (xmlNodePtr node) const;
 	void read (xmlNodePtr node);
diff --git a/code/nel/include/nel/logic/logic_state.h b/code/nel/include/nel/logic/logic_state.h
index dd9678f13..75e8572ac 100644
--- a/code/nel/include/nel/logic/logic_state.h
+++ b/code/nel/include/nel/logic/logic_state.h
@@ -149,7 +149,7 @@ public:
 	/**
 	 * serial
 	 */
-	//void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	//void serial(NLMISC::IStream &f);
 
 	void write (xmlNodePtr node) const;
 	void read (xmlNodePtr node);
diff --git a/code/nel/include/nel/logic/logic_state_machine.h b/code/nel/include/nel/logic/logic_state_machine.h
index f976ad405..7e87890b7 100644
--- a/code/nel/include/nel/logic/logic_state_machine.h
+++ b/code/nel/include/nel/logic/logic_state_machine.h
@@ -182,7 +182,7 @@ public:
 	/**
 	 * serial
 	 */
-	//void serial( NLMISC::IStream &f ) throw(NLMISC::EStream);
+	//void serial( NLMISC::IStream &f );
 
 	/**
 	 *	Display the variables
diff --git a/code/nel/include/nel/logic/logic_variable.h b/code/nel/include/nel/logic/logic_variable.h
index 8ccc0923e..f64a9e775 100644
--- a/code/nel/include/nel/logic/logic_variable.h
+++ b/code/nel/include/nel/logic/logic_variable.h
@@ -104,7 +104,7 @@ public:
 	/**
 	 * serial
 	 */
-	//virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	//virtual void serial(NLMISC::IStream &f);
 
 	virtual void write (xmlNodePtr node) const;
 	virtual void read (xmlNodePtr node);
@@ -186,7 +186,7 @@ public:
 	/**
 	 * serial
 	 */
-	//void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	//void serial(NLMISC::IStream &f);
 
 	virtual void write (xmlNodePtr node) const;
 	virtual void read (xmlNodePtr node);
diff --git a/code/nel/include/nel/misc/algo.h b/code/nel/include/nel/misc/algo.h
index 72d9ae3ae..50493538f 100644
--- a/code/nel/include/nel/misc/algo.h
+++ b/code/nel/include/nel/misc/algo.h
@@ -211,6 +211,14 @@ bool		strFindReplace(T &str, const char *strFind, const U &strReplace)
 	return strFindReplace(str, tempStr, strReplace);
 }
 
+template<class T>
+T strFindReplaceAll(const T &str, const T &search, const T &replace)
+{
+	T ret = str;
+	while (strFindReplace(ret, search, replace));
+	return ret;
+}
+
 // set flags in a bit set
 template <class T, class U>
 inline void setFlags(T &dest, U mask, bool on)
diff --git a/code/nel/include/nel/misc/array_2d.h b/code/nel/include/nel/misc/array_2d.h
index e5492986d..3c65ffa4c 100644
--- a/code/nel/include/nel/misc/array_2d.h
+++ b/code/nel/include/nel/misc/array_2d.h
@@ -132,7 +132,7 @@ public:
 	// See which parts of array will be discarded if the array is displaced by the given offset
 	void getDiscardRects(sint moveOffsetX, sint moveOffsetY, std::vector<NLMISC::CRect> &discardedRects);
 	//
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 private:
 	TArrayContainer _Array;
 	uint _Width;
@@ -157,7 +157,7 @@ void CArray2D<T>::clear()
 
 //*********************************************************************************
 template <class T>
-void CArray2D<T>::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CArray2D<T>::serial(NLMISC::IStream &f)
 {
 	f.serialCont(_Array);
 	uint32 width = _Width;
diff --git a/code/nel/include/nel/misc/common.h b/code/nel/include/nel/misc/common.h
index 4c2b38cca..eb70fce9e 100644
--- a/code/nel/include/nel/misc/common.h
+++ b/code/nel/include/nel/misc/common.h
@@ -233,6 +233,26 @@ char		toLower ( const char ch );	// convert only one character
 std::string	toUpper ( const std::string &str);
 void		toUpper ( char *str);
 
+
+/**
+ *  Convert to an hexadecimal std::string
+ */
+std::string toHexa(const uint8 &b);
+std::string toHexa(const uint8 *data, uint size);
+std::string toHexa(const std::string &str);
+std::string toHexa(const char *str);
+
+/**
+*  Convert from an hexadecimal std::string
+*/
+bool fromHexa(const std::string &hexa, uint8 &b);
+bool fromHexa(const std::string &hexa, uint8 *data);
+bool fromHexa(const std::string &hexa, std::string &str);
+bool fromHexa(const char *hexa, uint8 &b);
+bool fromHexa(const char *hexa, uint8 *data);
+bool fromHexa(const char *hexa, std::string &str);
+bool fromHexa(const char hexa, uint8 &b);
+
 // Remove all the characters <= 32 (tab, space, new line, return, vertical tab etc..) at the beginning and at the end of a string
 template <class T> T trim (const T &str)
 {
@@ -394,6 +414,9 @@ std::string expandEnvironmentVariables(const std::string &s);
 bool explodeArguments(const std::string &str, std::vector<std::string> &args);
 std::string joinArguments(const std::vector<std::string> &args);
 
+/// Escape an argument to not evaluate environment variables or special cases
+std::string escapeArgument(const std::string &arg);
+
 /// This function kills a program using his pid (on unix, it uses the kill() POSIX function)
 bool killProgram(uint32 pid);
 
diff --git a/code/nel/include/nel/misc/entity_id.h b/code/nel/include/nel/misc/entity_id.h
index 46561a512..8999b170a 100644
--- a/code/nel/include/nel/misc/entity_id.h
+++ b/code/nel/include/nel/misc/entity_id.h
@@ -450,8 +450,8 @@ public:
 	}
 
 
-	void serial (NLMISC::IStream &f) throw (NLMISC::EStream)
-//	virtual void serial (NLMISC::IStream &f) throw (NLMISC::EStream)
+	void serial (NLMISC::IStream &f)
+//	virtual void serial (NLMISC::IStream &f)
 	{
 		if (f.isReading ())
 		{
diff --git a/code/nel/include/nel/misc/fixed_size_allocator.h b/code/nel/include/nel/misc/fixed_size_allocator.h
index ffc975250..643217f5d 100644
--- a/code/nel/include/nel/misc/fixed_size_allocator.h
+++ b/code/nel/include/nel/misc/fixed_size_allocator.h
@@ -53,7 +53,7 @@ public:
 	uint getNumAllocatedBlocks() const { return _NumAlloc; }
 private:
 	class CChunk;
-	
+
 	class NL_ALIGN(NL_DEFAULT_MEMORY_ALIGNMENT) CNode
 	{
 	public:
diff --git a/code/nel/include/nel/misc/mouse_smoother.h b/code/nel/include/nel/misc/mouse_smoother.h
index f909cde96..18d741996 100644
--- a/code/nel/include/nel/misc/mouse_smoother.h
+++ b/code/nel/include/nel/misc/mouse_smoother.h
@@ -46,7 +46,7 @@ public:
 	double				getSamplingPeriod() const { return _SamplingPeriod; }
 	// Reset smoother. The next returned position will be the exact position of mouse (no smoothing with previous position is done)
 	void				reset();
-	// \return trueif no sampling has occurred since last resetor construction
+	// \return true if no sampling has occurred since last resetor construction
 	bool				isReseted() const { return !_Init; }
 	// Sample pos, and return smoothed position
 	CVector2f			samplePos(const CVector2f &wantedPos, double date);
diff --git a/code/nel/include/nel/misc/polygon.h b/code/nel/include/nel/misc/polygon.h
index a0183d20d..08889c26d 100644
--- a/code/nel/include/nel/misc/polygon.h
+++ b/code/nel/include/nel/misc/polygon.h
@@ -66,7 +66,7 @@ public:
 	float			computeArea() const;
 
 	/// Serial this polygon
-	void			serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void			serial(NLMISC::IStream &f);
 
 	/**
 	  * Convert a concave polygon into a list of convex polygons using a 2d projection.
@@ -156,7 +156,7 @@ public:
 	void		getBestTriplet(uint &index0, uint &index1, uint &index2);
 
 	/// Serial this polygon
-	void		serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void		serial(NLMISC::IStream &f);
 
 	typedef std::pair<sint, sint> TRaster;
 	typedef std::vector<TRaster>  TRasterVect;
diff --git a/code/nel/include/nel/misc/rgba.h b/code/nel/include/nel/misc/rgba.h
index e4fc6b61e..006b1f102 100644
--- a/code/nel/include/nel/misc/rgba.h
+++ b/code/nel/include/nel/misc/rgba.h
@@ -86,7 +86,7 @@ public:
 	 * Serialisation.
 	 * \param f Stream used for serialisation.
 	 */
-	void    serial (class NLMISC::IStream &f);
+	void    serial (NLMISC::IStream &f);
 
 	/**
 	 * Blend two colors.
@@ -451,7 +451,7 @@ public:
 	 * Serialisation.
 	 * \param f Stream used for serialisation.
 	 */
-	void    serial(class NLMISC::IStream &f);
+	void    serial(NLMISC::IStream &f);
 
 	/**
 	 * Blend two colors.
@@ -676,7 +676,7 @@ public:
 	 * Serialisation.
 	 * \param f Stream used for serialisation.
 	 */
-	void    serial(class NLMISC::IStream &f);
+	void    serial(NLMISC::IStream &f);
 
 	/**
 	 * Set colors.
diff --git a/code/nel/include/nel/misc/sheet_id.h b/code/nel/include/nel/misc/sheet_id.h
index 7a735d3a4..8db0470af 100644
--- a/code/nel/include/nel/misc/sheet_id.h
+++ b/code/nel/include/nel/misc/sheet_id.h
@@ -146,8 +146,8 @@ public :
 	/**
 	 *	Serial
 	 */
-	void serial(NLMISC::IStream	&f) throw(NLMISC::EStream);
-	void serialString(NLMISC::IStream &f, const std::string &defaultType = "") throw(NLMISC::EStream);
+	void serial(NLMISC::IStream	&f);
+	void serialString(NLMISC::IStream &f, const std::string &defaultType = "");
 
 	/**
 	 *  Display the list of valid sheet ids with their associated file names
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl.cpp b/code/nel/src/3d/driver/opengl/driver_opengl.cpp
index 80b424cba..023997065 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl.cpp
@@ -1195,11 +1195,11 @@ sint CDriverGL::getTotalVideoMemory() const
 
 	if (_Extensions.ATIMeminfo)
 	{
-		GLint memoryInKiB = 0;
-		glGetIntegerv(GL_TEXTURE_FREE_MEMORY_ATI, &memoryInKiB);
+		GLint params[4];
+		glGetIntegerv(GL_TEXTURE_FREE_MEMORY_ATI, params);
 
-		nlinfo("3D: GL_TEXTURE_FREE_MEMORY_ATI returned %d KiB", memoryInKiB);
-		return memoryInKiB;
+		nlinfo("3D: GL_TEXTURE_FREE_MEMORY_ATI returned %d KiB", params[0]);
+		return params[0];
 	}
 
 #if defined(NL_OS_WINDOWS)
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp
index ecadaaac2..b3a3e5194 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp
@@ -635,7 +635,7 @@ bool CDriverGL::renderRawQuads(CMaterial& mat, uint32 startIndex, uint32 numQuad
 				nlerror("not available in OpenGL ES 1.0, only use 16 bits indices");
 #else
 				// indices fits on 32 bits
-				GLint indices[QUAD_BATCH_SIZE];
+				GLint indices[QUAD_BATCH_SIZE * 6];
 				GLint *curr = indices;
 				GLint *end = indices + 6 * numQuadsToDraw;
 				uint32 vertexIndex = currIndex;
diff --git a/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp b/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp
index 898c9f001..a43a251a9 100644
--- a/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp
+++ b/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp
@@ -83,8 +83,6 @@ void CUnixEventEmitter::createIM()
 {
 #ifdef X_HAVE_UTF8_STRING
 
-	XModifierKeymap *g_mod_map = XGetModifierMapping(_dpy);
-
 	_im = XOpenIM(_dpy, NULL, NULL, NULL);
 
 	if (_im == NULL)
diff --git a/code/nel/src/3d/flare_shape.cpp b/code/nel/src/3d/flare_shape.cpp
index e8f74dc4e..1c4b864cd 100644
--- a/code/nel/src/3d/flare_shape.cpp
+++ b/code/nel/src/3d/flare_shape.cpp
@@ -63,7 +63,7 @@ CFlareShape::CFlareShape()  : _Color(NLMISC::CRGBA::White),
 
 
 // ***************************************************************************************************************
-void CFlareShape::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CFlareShape::serial(NLMISC::IStream &f)
 {
 	// Version 4 : - added occlusion test mesh, size reduction, angle modification when object is occluded
 	//             - added lookat mode for first flare
diff --git a/code/nel/src/3d/font_generator.cpp b/code/nel/src/3d/font_generator.cpp
index 0adf29418..f50b61c5b 100644
--- a/code/nel/src/3d/font_generator.cpp
+++ b/code/nel/src/3d/font_generator.cpp
@@ -271,7 +271,14 @@ void CFontGenerator::getSizes (ucchar c, uint32 size, uint32 &width, uint32 &hei
 	error = FT_Load_Glyph (_Face, glyph_index, FT_LOAD_DEFAULT);
 	if (error)
 	{
-		nlerror ("FT_Load_Glyph() failed: %s", getFT2Error(error));
+		// use fallback for glyph/character errors (composite char limit for example)
+		nlwarning ("FT_Load_Glyph() failed: %s", getFT2Error(error));
+
+		error = FT_Load_Glyph (_Face, 0, FT_LOAD_DEFAULT);
+		if (error)
+		{
+			nlerror("FT_Load_Glyph() fallback failed: %s", getFT2Error(error));
+		}
 	}
 
 	// convert 24.6 fixed point into integer
@@ -302,7 +309,14 @@ uint8 *CFontGenerator::getBitmap (ucchar c, uint32 size, bool embolden, bool obl
 	error = FT_Load_Glyph (_Face, glyph_index, FT_LOAD_DEFAULT);
 	if (error)
 	{
-		nlerror ("FT_Load_Glyph() failed: %s", getFT2Error(error));
+		// use fallback for glyph/character errors (composite char limit for example)
+		nlwarning ("FT_Load_Glyph() failed: %s", getFT2Error(error));
+
+		error = FT_Load_Glyph (_Face, 0, FT_LOAD_DEFAULT);
+		if (error)
+		{
+			nlerror("FT_Load_Glyph() fallback failed: %s", getFT2Error(error));
+		}
 	}
 
 	if (size == 0)
diff --git a/code/nel/src/3d/landscape.cpp b/code/nel/src/3d/landscape.cpp
index 8112053d7..4b597fc2d 100644
--- a/code/nel/src/3d/landscape.cpp
+++ b/code/nel/src/3d/landscape.cpp
@@ -139,7 +139,7 @@ public:
 	}
 
 	// Dummy serial...
-	virtual void	serial(NLMISC::IStream &/* f */)  throw(NLMISC::EStream) {nlstop;}
+	virtual void	serial(NLMISC::IStream &/* f */) { nlstop; }
 	NLMISC_DECLARE_CLASS(CTextureCross);
 };
 
diff --git a/code/nel/src/3d/mesh.cpp b/code/nel/src/3d/mesh.cpp
index cd3109733..51b07fdec 100644
--- a/code/nel/src/3d/mesh.cpp
+++ b/code/nel/src/3d/mesh.cpp
@@ -861,7 +861,7 @@ void	CMeshGeom::renderSimpleWithMaterial(IDriver *drv, const CMatrix &worldMatri
 
 
 // ***************************************************************************
-void	CMeshGeom::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void	CMeshGeom::serial(NLMISC::IStream &f)
 {
 	/* ***********************************************
 	 *	WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance
@@ -2389,7 +2389,7 @@ CMesh::CCorner::CCorner()
 
 
 // ***************************************************************************
-void CMesh::CCorner::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CMesh::CCorner::serial(NLMISC::IStream &f)
 {
 	nlassert(0); // not used
 	f.serial(Vertex);
@@ -2400,7 +2400,7 @@ void CMesh::CCorner::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
 }
 
 // ***************************************************************************
-void CMesh::CFace::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CMesh::CFace::serial(NLMISC::IStream &f)
 {
 	for(int i=0;i<3;++i)
 		f.serial(Corner[i]);
@@ -2409,7 +2409,7 @@ void CMesh::CFace::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
 }
 
 // ***************************************************************************
-void CMesh::CSkinWeight::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CMesh::CSkinWeight::serial(NLMISC::IStream &f)
 {
 	for(int i=0;i<NL3D_MESH_SKINNING_MAX_MATRIX;++i)
 	{
@@ -2420,7 +2420,7 @@ void CMesh::CSkinWeight::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
 
 // ***************************************************************************
 /* Serialization is not used.
-void CMesh::CMeshBuild::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CMesh::CMeshBuild::serial(NLMISC::IStream &f)
 {
 	sint	ver= f.serialVersion(0);
 
@@ -2604,7 +2604,7 @@ void	CMesh::render(IDriver *drv, CTransformShape *trans, bool passOpaque)
 
 
 // ***************************************************************************
-void	CMesh::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void	CMesh::serial(NLMISC::IStream &f)
 {
 	/* ***********************************************
 	 *	WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance
diff --git a/code/nel/src/3d/mesh_base.cpp b/code/nel/src/3d/mesh_base.cpp
index 3e11e7bfe..fdb4d6c8f 100644
--- a/code/nel/src/3d/mesh_base.cpp
+++ b/code/nel/src/3d/mesh_base.cpp
@@ -139,7 +139,7 @@ CMeshBase::CMeshBaseBuild::CMeshBaseBuild()
 
 // ***************************************************************************
 #if 0
-void	CMeshBase::CMeshBaseBuild::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void	CMeshBase::CMeshBaseBuild::serial(NLMISC::IStream &f)
 {
 	/*
 	Version 1:
@@ -164,7 +164,7 @@ void	CMeshBase::CMeshBaseBuild::serial(NLMISC::IStream &f) throw(NLMISC::EStream
 #endif
 
 // ***************************************************************************
-void	CMeshBase::serialMeshBase(NLMISC::IStream &f) throw(NLMISC::EStream)
+void	CMeshBase::serialMeshBase(NLMISC::IStream &f)
 {
 	/* ***********************************************
 	 *	WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance
diff --git a/code/nel/src/3d/mesh_morpher.cpp b/code/nel/src/3d/mesh_morpher.cpp
index 6d5d2dc73..d546bc97d 100644
--- a/code/nel/src/3d/mesh_morpher.cpp
+++ b/code/nel/src/3d/mesh_morpher.cpp
@@ -32,7 +32,7 @@ namespace NL3D
 {
 
 // ***************************************************************************
-void CBlendShape::serial (NLMISC::IStream &f) throw(NLMISC::EStream)
+void CBlendShape::serial (NLMISC::IStream &f)
 {
 	/* ***********************************************
 	 *	WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance
@@ -345,7 +345,7 @@ void CMeshMorpher::updateSkinned (std::vector<CAnimatedMorph> *pBSFactor)
 }
 
 // ***************************************************************************
-void CMeshMorpher::serial (NLMISC::IStream &f) throw(NLMISC::EStream)
+void CMeshMorpher::serial (NLMISC::IStream &f)
 {
 	/* ***********************************************
 	 *	WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance
diff --git a/code/nel/src/3d/mesh_mrm.cpp b/code/nel/src/3d/mesh_mrm.cpp
index 407d342b4..f31720f35 100644
--- a/code/nel/src/3d/mesh_mrm.cpp
+++ b/code/nel/src/3d/mesh_mrm.cpp
@@ -1604,7 +1604,7 @@ void	CMeshMRMGeom::updateShiftedTriangleCache(CMeshMRMInstance *mi, sint curLodI
 
 
 // ***************************************************************************
-void	CMeshMRMGeom::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void	CMeshMRMGeom::serial(NLMISC::IStream &f)
 {
 	// because of complexity, serial is separated in save / load.
 
@@ -1618,7 +1618,7 @@ void	CMeshMRMGeom::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
 
 
 // ***************************************************************************
-sint	CMeshMRMGeom::loadHeader(NLMISC::IStream &f) throw(NLMISC::EStream)
+sint	CMeshMRMGeom::loadHeader(NLMISC::IStream &f)
 {
 	/*
 	Version 5:
@@ -1748,7 +1748,7 @@ sint	CMeshMRMGeom::loadHeader(NLMISC::IStream &f) throw(NLMISC::EStream)
 
 
 // ***************************************************************************
-void	CMeshMRMGeom::load(NLMISC::IStream &f) throw(NLMISC::EStream)
+void	CMeshMRMGeom::load(NLMISC::IStream &f)
 {
 	// Load the header of the stream.
 	// ==================
@@ -1778,7 +1778,7 @@ void	CMeshMRMGeom::load(NLMISC::IStream &f) throw(NLMISC::EStream)
 
 
 // ***************************************************************************
-void	CMeshMRMGeom::save(NLMISC::IStream &f) throw(NLMISC::EStream)
+void	CMeshMRMGeom::save(NLMISC::IStream &f)
 {
 	/*
 	Version 5:
@@ -2968,7 +2968,7 @@ void	CMeshMRM::render(IDriver *drv, CTransformShape *trans, bool passOpaque)
 
 
 // ***************************************************************************
-void	CMeshMRM::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void	CMeshMRM::serial(NLMISC::IStream &f)
 {
 	/*
 	Version 0:
diff --git a/code/nel/src/3d/mesh_multi_lod.cpp b/code/nel/src/3d/mesh_multi_lod.cpp
index f200e2bc6..b3d51cc52 100644
--- a/code/nel/src/3d/mesh_multi_lod.cpp
+++ b/code/nel/src/3d/mesh_multi_lod.cpp
@@ -288,7 +288,7 @@ void CMeshMultiLod::render(IDriver *drv, CTransformShape *trans, bool passOpaque
 
 // ***************************************************************************
 
-void CMeshMultiLod::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CMeshMultiLod::serial(NLMISC::IStream &f)
 {
 	/* ***********************************************
 	 *	WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance
@@ -405,7 +405,7 @@ void CMeshMultiLod::clear ()
 
 // ***************************************************************************
 
-void CMeshMultiLod::CMeshSlot::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CMeshMultiLod::CMeshSlot::serial(NLMISC::IStream &f)
 {
 	// Check version
 	(void)f.serialVersion (0);
diff --git a/code/nel/src/3d/meshvp_per_pixel_light.cpp b/code/nel/src/3d/meshvp_per_pixel_light.cpp
index 6bbcec5c6..3449d57d2 100644
--- a/code/nel/src/3d/meshvp_per_pixel_light.cpp
+++ b/code/nel/src/3d/meshvp_per_pixel_light.cpp
@@ -573,7 +573,7 @@ void	CMeshVPPerPixelLight::end(IDriver *drv)
 
 
 //=================================================================================
-void	CMeshVPPerPixelLight::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void	CMeshVPPerPixelLight::serial(NLMISC::IStream &f)
 {
 	(void)f.serialVersion(0);
 	f.serial(SpecularLighting);
diff --git a/code/nel/src/3d/meshvp_wind_tree.cpp b/code/nel/src/3d/meshvp_wind_tree.cpp
index ba27216f0..620465a0a 100644
--- a/code/nel/src/3d/meshvp_wind_tree.cpp
+++ b/code/nel/src/3d/meshvp_wind_tree.cpp
@@ -194,7 +194,7 @@ CMeshVPWindTree::~CMeshVPWindTree()
 
 
 // ***************************************************************************
-void	CMeshVPWindTree::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void	CMeshVPWindTree::serial(NLMISC::IStream &f)
 {
 	(void)f.serialVersion(0);
 
diff --git a/code/nel/src/3d/packed_world.cpp b/code/nel/src/3d/packed_world.cpp
index f1ad22ab2..830dc218e 100644
--- a/code/nel/src/3d/packed_world.cpp
+++ b/code/nel/src/3d/packed_world.cpp
@@ -153,7 +153,7 @@ void CPackedWorld::getZones(std::vector<TPackedZoneBaseSPtr> &zones)
 }
 
 // *************************************************************************************************
-void CPackedWorld::serialZoneNames(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPackedWorld::serialZoneNames(NLMISC::IStream &f)
 {
 	f.serialVersion(1);
 	f.serialCheck(NELID("OWPA"));
@@ -161,7 +161,7 @@ void CPackedWorld::serialZoneNames(NLMISC::IStream &f) throw(NLMISC::EStream)
 }
 
 // *************************************************************************************************
-void CPackedWorld::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPackedWorld::serial(NLMISC::IStream &f)
 {
 	serialZoneNames(f);
 	f.serialCont(_Zones);
diff --git a/code/nel/src/3d/packed_zone.cpp b/code/nel/src/3d/packed_zone.cpp
index dbc9b2d1d..aa3eff11f 100644
--- a/code/nel/src/3d/packed_zone.cpp
+++ b/code/nel/src/3d/packed_zone.cpp
@@ -590,7 +590,7 @@ CPackedZone32::CPackedZone32()
 }
 
 // ***************************************************************************************
-void CPackedZone32::serial(NLMISC::IStream &f) throw (NLMISC::EStream)
+void CPackedZone32::serial(NLMISC::IStream &f)
 {
 	f.serialVersion(0);
 	f.serial(Box);
@@ -1086,7 +1086,7 @@ CSmartPtr<CPackedZone16> CPackedZone32::buildPackedZone16()
 }
 
 // ***************************************************************************************
-void CPackedZone16::serial(NLMISC::IStream &f) throw (NLMISC::EStream)
+void CPackedZone16::serial(NLMISC::IStream &f)
 {
 	f.serialVersion(0);
 	f.serial(Box);
diff --git a/code/nel/src/3d/particle_system.cpp b/code/nel/src/3d/particle_system.cpp
index 477739e98..2c10f279b 100644
--- a/code/nel/src/3d/particle_system.cpp
+++ b/code/nel/src/3d/particle_system.cpp
@@ -752,7 +752,7 @@ void CParticleSystem::step(TPass pass, TAnimationTime ellapsedTime, CParticleSys
 
 
 ///=======================================================================================
-void CParticleSystem::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CParticleSystem::serial(NLMISC::IStream &f)
 {
 	CHECK_INTEGRITY
 	NL_PS_FUNC_MAIN(CParticleSystem_serial)
diff --git a/code/nel/src/3d/particle_system_process.cpp b/code/nel/src/3d/particle_system_process.cpp
index 8150d56d1..9317f6a6b 100644
--- a/code/nel/src/3d/particle_system_process.cpp
+++ b/code/nel/src/3d/particle_system_process.cpp
@@ -129,7 +129,7 @@ const CFontManager *CParticleSystemProcess::getFontManager(void) const
 
 
 // ***********************************************************************************************************
-void CParticleSystemProcess::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CParticleSystemProcess::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CParticleSystemProcess_serial)
 	// version 2 : added matrix mode (just not fx world matrix or identity)
diff --git a/code/nel/src/3d/particle_system_shape.cpp b/code/nel/src/3d/particle_system_shape.cpp
index 94851c3eb..7da2e85f1 100644
--- a/code/nel/src/3d/particle_system_shape.cpp
+++ b/code/nel/src/3d/particle_system_shape.cpp
@@ -117,7 +117,7 @@ CParticleSystemShape::CParticleSystemShape() : _MaxViewDist(100.f),
 }
 
 ///===========================================================================
-void	CParticleSystemShape::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void	CParticleSystemShape::serial(NLMISC::IStream &f)
 {
 	/* ***********************************************
 	 *	WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance
diff --git a/code/nel/src/3d/ps_attrib_maker_helper.cpp b/code/nel/src/3d/ps_attrib_maker_helper.cpp
index 56dd0ec84..aaa6b5a4d 100644
--- a/code/nel/src/3d/ps_attrib_maker_helper.cpp
+++ b/code/nel/src/3d/ps_attrib_maker_helper.cpp
@@ -26,7 +26,7 @@ namespace NL3D
 
 
 // ***********************************************************************************
-void CPSAttribMakerMemory<uint32>::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSAttribMakerMemory<uint32>::serial(NLMISC::IStream &f)
 {
 	CPSAttribMakerMemoryBase<uint32>::serial(f);
 	if (f.isReading())
@@ -59,7 +59,7 @@ void CPSAttribMakerMemory<uint32>::newElement(const CPSEmitterInfo &info)
 }
 
 // ***********************************************************************************
-void CPSAttribMakerMemory<sint32>::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSAttribMakerMemory<sint32>::serial(NLMISC::IStream &f)
 {
 	CPSAttribMakerMemoryBase<sint32>::serial(f);
 	if (f.isReading())
@@ -92,7 +92,7 @@ void CPSAttribMakerMemory<sint32>::newElement(const CPSEmitterInfo &info)
 }
 
 // ***********************************************************************************
-void CPSAttribMakerMemory<float>::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSAttribMakerMemory<float>::serial(NLMISC::IStream &f)
 {
 	CPSAttribMakerMemoryBase<float>::serial(f);
 	if (f.isReading())
diff --git a/code/nel/src/3d/ps_color.cpp b/code/nel/src/3d/ps_color.cpp
index 4fbda508a..e93a85e4e 100644
--- a/code/nel/src/3d/ps_color.cpp
+++ b/code/nel/src/3d/ps_color.cpp
@@ -76,7 +76,7 @@ NLMISC::CRGBA CPSColorMemory::getDefaultValue(void) const
 }
 
 ///======================================================================================
-void CPSColorMemory::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSColorMemory::serial(NLMISC::IStream &f)
 {
 	setColorType(CVertexBuffer::TRGBA);
 	CPSAttribMakerMemory<NLMISC::CRGBA>::serial(f);
@@ -90,7 +90,7 @@ void CPSColorBinOp::setColorType(CVertexBuffer::TVertexColorType colorType)
 }
 
 ///======================================================================================
-void CPSColorBinOp::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSColorBinOp::serial(NLMISC::IStream &f)
 {
 	setColorType(CVertexBuffer::TRGBA);
 	CPSAttribMakerBinOp<NLMISC::CRGBA>::serial(f);
diff --git a/code/nel/src/3d/ps_dot.cpp b/code/nel/src/3d/ps_dot.cpp
index bf1f51b4d..3082e506b 100644
--- a/code/nel/src/3d/ps_dot.cpp
+++ b/code/nel/src/3d/ps_dot.cpp
@@ -290,7 +290,7 @@ void CPSDot::resize(uint32 size)
 }
 
 ///===================================================================
-void CPSDot::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSDot::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSDot_IStream )
 
diff --git a/code/nel/src/3d/ps_emitter.cpp b/code/nel/src/3d/ps_emitter.cpp
index 7fb5a6516..240be6f51 100644
--- a/code/nel/src/3d/ps_emitter.cpp
+++ b/code/nel/src/3d/ps_emitter.cpp
@@ -1917,7 +1917,7 @@ void CPSEmitter::bounceOccurred(uint32 index, TAnimationTime timeToNextSimStep)
 }
 
 ///==========================================================================
-void CPSEmitter::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSEmitter::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSEmitter_serial)
 	/// version 6  : the flag _EmitDirBasis no longer exist, it has been replaced by _UserMatrixModeForEmissionDirection
@@ -2184,7 +2184,7 @@ bool CPSEmitter::testEmitForever() const
 // implementation of CPSModulatedEmitter  //
 ////////////////////////////////////////////
 
-void CPSModulatedEmitter::serialEmitteeSpeedScheme(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSModulatedEmitter::serialEmitteeSpeedScheme(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSModulatedEmitter_IStream )
 	bool useScheme;
@@ -2228,7 +2228,7 @@ void CPSEmitterOmni::emit(const NLMISC::CVector &srcPos, uint32 index, CVector &
 }
 
 ///==========================================================================
-void CPSEmitterOmni::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSEmitterOmni::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSEmitterOmni_serial)
 	f.serialVersion(1);
@@ -2332,7 +2332,7 @@ void CPSEmitterDirectionnal::resize(uint32 capacity)
 }
 
 ///==========================================================================
-void CPSEmitterDirectionnal::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSEmitterDirectionnal::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSEmitterDirectionnal_IStream )
 	f.serialVersion(1);
@@ -2346,7 +2346,7 @@ void CPSEmitterDirectionnal::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
 ////////////////////////////////////////////
 
 ///==========================================================================
-void CPSEmitterRectangle::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSEmitterRectangle::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSEmitterRectangle_IStream )
 	f.serialVersion(1);
@@ -2506,7 +2506,7 @@ void CPSEmitterRectangle::showTool(void)
 ////////////////////////////////////
 
 ///==========================================================================
-void CPSEmitterConic::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSEmitterConic::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSEmitterConic_serial)
 	f.serialVersion(1);
@@ -2611,7 +2611,7 @@ CMatrix CPSSphericalEmitter::getMatrix(uint32 index) const
 }
 
 ///==========================================================================
-void CPSSphericalEmitter::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSSphericalEmitter::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSSphericalEmitter_serial)
 	f.serialVersion(1);
@@ -2668,7 +2668,7 @@ void CPSSphericalEmitter::resize(uint32 size)
 /////////////////////////////////////
 
 ///==========================================================================
-void CPSRadialEmitter::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSRadialEmitter::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSRadialEmitter_serial)
 	f.serialVersion(1);
diff --git a/code/nel/src/3d/ps_face.cpp b/code/nel/src/3d/ps_face.cpp
index 0d3ce6482..43bd921ab 100644
--- a/code/nel/src/3d/ps_face.cpp
+++ b/code/nel/src/3d/ps_face.cpp
@@ -293,7 +293,7 @@ void CPSFace::step(TPSProcessPass pass)
 
 
 ///======================================================================================
-void CPSFace::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSFace::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSFace_IStream )
 	f.serialVersion(1);
diff --git a/code/nel/src/3d/ps_face_look_at.cpp b/code/nel/src/3d/ps_face_look_at.cpp
index d6ac0ec0f..000db78e6 100644
--- a/code/nel/src/3d/ps_face_look_at.cpp
+++ b/code/nel/src/3d/ps_face_look_at.cpp
@@ -996,7 +996,7 @@ void CPSFaceLookAt::resize(uint32 capacity)
 
 
 ///===========================================================================================
-void CPSFaceLookAt::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSFaceLookAt::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSFaceLookAt_serial)
 	// version 4 : added 'align on z-axis' flag
diff --git a/code/nel/src/3d/ps_fan_light.cpp b/code/nel/src/3d/ps_fan_light.cpp
index 6296373b6..a2a0dcf0b 100644
--- a/code/nel/src/3d/ps_fan_light.cpp
+++ b/code/nel/src/3d/ps_fan_light.cpp
@@ -393,7 +393,7 @@ void CPSFanLight::draw(bool opaque)
 }
 
 ///====================================================================================
-void CPSFanLight::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSFanLight::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSFanLight_serial)
 	sint ver = f.serialVersion(2);
diff --git a/code/nel/src/3d/ps_float.cpp b/code/nel/src/3d/ps_float.cpp
index f4f0a7226..7c364f2b8 100644
--- a/code/nel/src/3d/ps_float.cpp
+++ b/code/nel/src/3d/ps_float.cpp
@@ -151,7 +151,7 @@ void CPSFloatCurveFunctor::updateTab(void)
 }
 
 ///=======================================================================================
-void CPSFloatCurveFunctor::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSFloatCurveFunctor::serial(NLMISC::IStream &f)
 {
 	f.serialVersion(1);
 	f.serial(_NumSamples, _Smoothing);
diff --git a/code/nel/src/3d/ps_force.cpp b/code/nel/src/3d/ps_force.cpp
index bf0ca662d..fa42766b1 100644
--- a/code/nel/src/3d/ps_force.cpp
+++ b/code/nel/src/3d/ps_force.cpp
@@ -45,7 +45,7 @@ CPSForce::CPSForce()
 
 
 
-void CPSForce::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSForce::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSForce_serial)
 	f.serialVersion(1);
@@ -189,7 +189,7 @@ void CPSForceIntensity::setIntensityScheme(CPSAttribMaker<float> *scheme)
 	if (getForceIntensityOwner() && scheme->hasMemory()) scheme->resize(getForceIntensityOwner()->getMaxSize(), getForceIntensityOwner()->getSize());
 }
 
-void CPSForceIntensity::serialForceIntensity(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSForceIntensity::serialForceIntensity(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSForceIntensity_IStream )
 	f.serialVersion(1);
@@ -229,7 +229,7 @@ void CPSForceIntensity::serialForceIntensity(NLMISC::IStream &f) throw(NLMISC::E
 ////////////////////////////////////////
 
 
-void CPSForceIntensityHelper::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSForceIntensityHelper::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSForceIntensityHelper_serial)
 	f.serialVersion(1);
@@ -320,7 +320,7 @@ void CPSDirectionnalForce::show()
 	}
 }
 
-void CPSDirectionnalForce::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSDirectionnalForce::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSDirectionnalForce_serial)
 	// Version 2 : added link to a global vector value
@@ -488,7 +488,7 @@ void CPSGravity::show()
 
 }
 
-void CPSGravity::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSGravity::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSGravity_IStream )
 	f.serialVersion(1);
@@ -747,7 +747,7 @@ void CPSCentralGravity::show()
 	displayIcon2d(tab, tabSize, sSize);
 }
 
-void CPSCentralGravity::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSCentralGravity::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSCentralGravity_IStream )
 	f.serialVersion(1);
@@ -785,7 +785,7 @@ void CPSSpring::computeForces(CPSLocated &target)
 }
 
 
-void CPSSpring::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSSpring::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSSpring_serial)
 	f.serialVersion(1);
@@ -921,7 +921,7 @@ CMatrix CPSCylindricVortex::getMatrix(uint32 index) const
 }
 
 
-void CPSCylindricVortex::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSCylindricVortex::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSCylindricVortex_IStream )
 	f.serialVersion(1);
@@ -960,7 +960,7 @@ void CPSCylindricVortex::resize(uint32 size)
  *  a magnetic field that has the given direction
  */
 
-void CPSMagneticForce::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSMagneticForce::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSMagneticForce_serial)
 	f.serialVersion(1);
@@ -1369,7 +1369,7 @@ void CPSBrownianForce::computeForces(CPSLocated &target)
 }
 
 ///=======================================================================
-void CPSBrownianForce::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSBrownianForce::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSBrownianForce_serial)
 	sint ver = f.serialVersion(3);
diff --git a/code/nel/src/3d/ps_light.cpp b/code/nel/src/3d/ps_light.cpp
index 034a5bfcb..48e579283 100644
--- a/code/nel/src/3d/ps_light.cpp
+++ b/code/nel/src/3d/ps_light.cpp
@@ -72,7 +72,7 @@ CPSLight::~CPSLight()
 }
 
 // ***************************************************************************************************************
-void CPSLight::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSLight::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSLight_serial)
 	CPSLocatedBindable::serial(f);
diff --git a/code/nel/src/3d/ps_located.cpp b/code/nel/src/3d/ps_located.cpp
index 8dbe2d823..1af7b370d 100644
--- a/code/nel/src/3d/ps_located.cpp
+++ b/code/nel/src/3d/ps_located.cpp
@@ -1411,7 +1411,7 @@ void CPSLocated::resize(uint32 newSize)
 class CDummyCollision
 {
 public:
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		NL_PS_FUNC(CDummyCollision_serial)
 		f.serialVersion(1);
@@ -1422,7 +1422,7 @@ public:
 };
 
 /// ***************************************************************************************
-void CPSLocated::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSLocated::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSLocated_serial)
 
@@ -2710,7 +2710,7 @@ void CPSLocatedBindable::notifyTargetRemoved(CPSLocated *ptr)
 }
 
 /// ***************************************************************************************
-void CPSLocatedBindable::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSLocatedBindable::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSLocatedBindable_IStream )
 	sint ver = f.serialVersion(4);
@@ -2902,7 +2902,7 @@ void CPSLocatedBindable::releaseAllRef()
 /////////////////////////////////////////////
 
 /// ***************************************************************************************
-void CPSTargetLocatedBindable::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSTargetLocatedBindable::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSTargetLocatedBindable_serial)
 	(void)f.serialVersion(1);
diff --git a/code/nel/src/3d/ps_mesh.cpp b/code/nel/src/3d/ps_mesh.cpp
index 3331ac315..6f21e2c25 100644
--- a/code/nel/src/3d/ps_mesh.cpp
+++ b/code/nel/src/3d/ps_mesh.cpp
@@ -158,7 +158,7 @@ static CMesh *CreateDummyMesh(void)
 
 
 //====================================================================================
-void CPSMesh::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSMesh::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSMesh_IStream )
 	(void)f.serialVersion(3);
@@ -1448,7 +1448,7 @@ void CPSConstraintMesh::fillIndexesInPrecompBasis(void)
 
 //====================================================================================
 /// serialisation. Derivers must override this, and call their parent version
-void CPSConstraintMesh::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSConstraintMesh::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSConstraintMesh_IStream )
 
@@ -2267,7 +2267,7 @@ CPSConstraintMesh::CGlobalTexAnim::CGlobalTexAnim() : TransOffset(NLMISC::CVecto
 }
 
 //=====================================================================================
-void	CPSConstraintMesh::CGlobalTexAnim::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void	CPSConstraintMesh::CGlobalTexAnim::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CGlobalTexAnim_IStream )
 	// version 1 : added offset
@@ -2365,7 +2365,7 @@ void  CPSConstraintMesh::setTexAnimType(TTexAnimType type)
 }
 
 //=====================================================================================
-void	CPSConstraintMesh::CGlobalTexAnims::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void	CPSConstraintMesh::CGlobalTexAnims::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CGlobalTexAnims_IStream )
 	f.serialVersion(0);
diff --git a/code/nel/src/3d/ps_particle_basic.cpp b/code/nel/src/3d/ps_particle_basic.cpp
index 42e4d31c6..110b5963b 100644
--- a/code/nel/src/3d/ps_particle_basic.cpp
+++ b/code/nel/src/3d/ps_particle_basic.cpp
@@ -152,7 +152,7 @@ CPSColoredParticle::~CPSColoredParticle()
 }
 
 //=======================================
-void CPSColoredParticle::serialColorScheme(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSColoredParticle::serialColorScheme(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSColoredParticle_IStream )
 	f.serialVersion(1);
@@ -213,7 +213,7 @@ CPSSizedParticle::~CPSSizedParticle()
 }
 
 //=======================================
-void CPSSizedParticle::serialSizeScheme(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSSizedParticle::serialSizeScheme(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSSizedParticle_serialSizeScheme)
 	f.serialVersion(1);
@@ -277,7 +277,7 @@ CPSRotated2DParticle::~CPSRotated2DParticle()
 }
 
 ///===================================================================================
-void CPSRotated2DParticle::serialAngle2DScheme(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSRotated2DParticle::serialAngle2DScheme(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSRotated2DParticle_serialAngle2DScheme)
 	f.serialVersion(1);
@@ -387,7 +387,7 @@ CPSTexturedParticle::~CPSTexturedParticle()
 }
 
 ///===================================================================================
-void CPSTexturedParticle::serialTextureScheme(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSTexturedParticle::serialTextureScheme(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSTexturedParticle_serialTextureScheme)
 	f.serialVersion(1);
@@ -489,7 +489,7 @@ CPSRotated3DPlaneParticle::~CPSRotated3DPlaneParticle()
 }
 
 ///===================================================================================
-void CPSRotated3DPlaneParticle::serialPlaneBasisScheme(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSRotated3DPlaneParticle::serialPlaneBasisScheme(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSRotated3DPlaneParticle_serialPlaneBasisScheme)
 	f.serialVersion(1);
@@ -515,7 +515,7 @@ CPSMaterial::CPSMaterial()
 }
 
 ///===================================================================================
-void CPSMaterial::serialMaterial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSMaterial::serialMaterial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSMaterial_IStream )
 	// version 3 : added zbias
@@ -726,7 +726,7 @@ void	CPSMultiTexturedParticle::enableAlternateTex(bool enabled /*= true*/)
 }
 
 //=======================================
-void	CPSMultiTexturedParticle::serialMultiTex(NLMISC::IStream &f) throw(NLMISC::EStream)
+void	CPSMultiTexturedParticle::serialMultiTex(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSMultiTexturedParticle_serialMultiTex)
 	/// version 1 : bump factor
diff --git a/code/nel/src/3d/ps_plane_basis_maker.cpp b/code/nel/src/3d/ps_plane_basis_maker.cpp
index bdc99cd18..05df5821b 100644
--- a/code/nel/src/3d/ps_plane_basis_maker.cpp
+++ b/code/nel/src/3d/ps_plane_basis_maker.cpp
@@ -320,7 +320,7 @@ uint32 CSpinnerFunctor::getNumSamples(void) const
 }
 
 ///============================================================================
-void CSpinnerFunctor::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CSpinnerFunctor::serial(NLMISC::IStream &f)
 {
 	f.serialVersion(1);
 	f.serial(_Axis, _NbSamples);
diff --git a/code/nel/src/3d/ps_quad.cpp b/code/nel/src/3d/ps_quad.cpp
index 295c31c93..8ce6ce821 100644
--- a/code/nel/src/3d/ps_quad.cpp
+++ b/code/nel/src/3d/ps_quad.cpp
@@ -382,7 +382,7 @@ void CPSQuad::updateMatAndVbForColor(void)
 }
 
 //==============================================================
-void CPSQuad::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSQuad::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSQuad_serial)
 	sint ver = f.serialVersion(2);
diff --git a/code/nel/src/3d/ps_ribbon.cpp b/code/nel/src/3d/ps_ribbon.cpp
index 06bb08787..499991b5e 100644
--- a/code/nel/src/3d/ps_ribbon.cpp
+++ b/code/nel/src/3d/ps_ribbon.cpp
@@ -136,7 +136,7 @@ struct CDummy2DAngle : CPSRotated2DParticle
 };
 
 ///==================================================================================================================
-void CPSRibbon::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSRibbon::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSRibbon_serial)
 	// Version 3 : - added brace mode
diff --git a/code/nel/src/3d/ps_ribbon_base.cpp b/code/nel/src/3d/ps_ribbon_base.cpp
index a3f70253b..e56ebc4d4 100644
--- a/code/nel/src/3d/ps_ribbon_base.cpp
+++ b/code/nel/src/3d/ps_ribbon_base.cpp
@@ -750,7 +750,7 @@ void CPSRibbonBase::initDateVect()
 
 
 //=======================================================
-void CPSRibbonBase::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSRibbonBase::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSRibbonBase_serial)
 	CPSParticle::serial(f);
diff --git a/code/nel/src/3d/ps_ribbon_look_at.cpp b/code/nel/src/3d/ps_ribbon_look_at.cpp
index 2e03acaf6..d7c646fc9 100644
--- a/code/nel/src/3d/ps_ribbon_look_at.cpp
+++ b/code/nel/src/3d/ps_ribbon_look_at.cpp
@@ -61,7 +61,7 @@ CPSRibbonLookAt::~CPSRibbonLookAt()
 }
 
 //=======================================================
-void CPSRibbonLookAt::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSRibbonLookAt::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSRibbonLookAt_serial)
 	/** Version 4 : added CPSRibbonBase has a base class instead of CPSParticle
diff --git a/code/nel/src/3d/ps_shockwave.cpp b/code/nel/src/3d/ps_shockwave.cpp
index dc94f5f96..cc7547c45 100644
--- a/code/nel/src/3d/ps_shockwave.cpp
+++ b/code/nel/src/3d/ps_shockwave.cpp
@@ -262,7 +262,7 @@ void	CPSShockWave::setUFactor(float value)
 }
 
 ///=================================================================================
-void CPSShockWave::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSShockWave::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSShockWave_serial)
 	sint ver  = f.serialVersion(2);
diff --git a/code/nel/src/3d/ps_sound.cpp b/code/nel/src/3d/ps_sound.cpp
index 873b3ed34..d0b82adb2 100644
--- a/code/nel/src/3d/ps_sound.cpp
+++ b/code/nel/src/3d/ps_sound.cpp
@@ -261,7 +261,7 @@ void	CPSSound::setPitchScheme(CPSAttribMaker<float> *pitch)
 }
 
 // ***************************************************************************************************
-void			CPSSound::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void			CPSSound::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSSound_serial)
 	CPSLocatedBindable::serial(f);
diff --git a/code/nel/src/3d/ps_tail_dot.cpp b/code/nel/src/3d/ps_tail_dot.cpp
index 69caa8f71..e8146e582 100644
--- a/code/nel/src/3d/ps_tail_dot.cpp
+++ b/code/nel/src/3d/ps_tail_dot.cpp
@@ -79,7 +79,7 @@ CPSTailDot::~CPSTailDot()
 }
 
 //=======================================================
-void CPSTailDot::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSTailDot::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSTailDot_serial)
 
diff --git a/code/nel/src/3d/ps_zone.cpp b/code/nel/src/3d/ps_zone.cpp
index 55a65d68f..7adf48b8f 100644
--- a/code/nel/src/3d/ps_zone.cpp
+++ b/code/nel/src/3d/ps_zone.cpp
@@ -47,7 +47,7 @@ CPSZone::CPSZone() : _BounceFactor(1.f), _CollisionBehaviour(bounce)
 	NL_PS_FUNC(CPSZone_CPSZone)
 }
 
-void CPSZone::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSZone::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSZone_serial)
 	f.serialVersion(1);
@@ -280,7 +280,7 @@ void CPSZonePlane::setNormal(uint32 index, CVector n)
 
 
 
-void CPSZonePlane::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSZonePlane::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSZonePlane_serial)
 	f.serialVersion(1);
@@ -420,7 +420,7 @@ CVector CPSZoneSphere::getScale(uint32 k) const
 }
 
 
-void CPSZoneSphere::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSZoneSphere::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSZoneSphere_serial)
 	f.serialVersion(1);
@@ -600,7 +600,7 @@ CVector CPSZoneDisc::getScale(uint32 k) const
 }
 
 
-void CPSZoneDisc::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSZoneDisc::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSZoneDisc_serial)
 	f.serialVersion(1);
@@ -1089,7 +1089,7 @@ void CPSZoneCylinder::setScale(uint32 index, const CVector &s)
 }
 
 
-void CPSZoneCylinder::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSZoneCylinder::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSZoneCylinder_serial)
 	f.serialVersion(1);
@@ -1269,7 +1269,7 @@ CVector CPSZoneRectangle::getScale(uint32 index) const
 
 
 
-void CPSZoneRectangle::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPSZoneRectangle::serial(NLMISC::IStream &f)
 {
 	NL_PS_FUNC(CPSZoneRectangle_IStream )
 	f.serialVersion(1);
diff --git a/code/nel/src/3d/seg_remanence_shape.cpp b/code/nel/src/3d/seg_remanence_shape.cpp
index f31b2c0b2..eb546177c 100644
--- a/code/nel/src/3d/seg_remanence_shape.cpp
+++ b/code/nel/src/3d/seg_remanence_shape.cpp
@@ -47,7 +47,7 @@ CSegRemanenceShape::CSegRemanenceShape() : _GeomTouched(true),
 }
 
 //===========================================================
-void CSegRemanenceShape::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CSegRemanenceShape::serial(NLMISC::IStream &f)
 {
 	// version 2 : added default tracks
 	// version 1 : rollup ratio
diff --git a/code/nel/src/3d/shape.cpp b/code/nel/src/3d/shape.cpp
index 6b0db63b8..93e0cccd7 100644
--- a/code/nel/src/3d/shape.cpp
+++ b/code/nel/src/3d/shape.cpp
@@ -116,7 +116,7 @@ IShape*	CShapeStream::getShapePointer () const
 
 
 // ***************************************************************************
-void CShapeStream::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CShapeStream::serial(NLMISC::IStream &f)
 {
 	// First, serial an header or checking if it is correct
 	f.serialCheck (NELID("PAHS"));
diff --git a/code/nel/src/3d/skeleton_shape.cpp b/code/nel/src/3d/skeleton_shape.cpp
index 230915407..afa7701af 100644
--- a/code/nel/src/3d/skeleton_shape.cpp
+++ b/code/nel/src/3d/skeleton_shape.cpp
@@ -33,7 +33,7 @@ namespace NL3D
 
 
 // ***************************************************************************
-void	CSkeletonShape::CLod::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void	CSkeletonShape::CLod::serial(NLMISC::IStream &f)
 {
 	(void)f.serialVersion(0);
 
@@ -175,7 +175,7 @@ CTransformShape		*CSkeletonShape::createInstance(CScene &scene)
 }
 
 // ***************************************************************************
-void			CSkeletonShape::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void			CSkeletonShape::serial(NLMISC::IStream &f)
 {
 	/*
 	Version 1:
diff --git a/code/nel/src/3d/texture.cpp b/code/nel/src/3d/texture.cpp
index 3e248e521..c31fecdea 100644
--- a/code/nel/src/3d/texture.cpp
+++ b/code/nel/src/3d/texture.cpp
@@ -136,7 +136,7 @@ ITextureDrvInfos::~ITextureDrvInfos()
 
 
 // ***************************************************************************
-void	ITexture::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void	ITexture::serial(NLMISC::IStream &f)
 {
 	/*
 	Version 1:
diff --git a/code/nel/src/3d/texture_blend.cpp b/code/nel/src/3d/texture_blend.cpp
index 0d85664d6..aad39cc6d 100644
--- a/code/nel/src/3d/texture_blend.cpp
+++ b/code/nel/src/3d/texture_blend.cpp
@@ -112,7 +112,7 @@ void CTextureBlend::doGenerate(bool async)
 
 
 // ************************************************************************
-void	CTextureBlend::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void	CTextureBlend::serial(NLMISC::IStream &f)
 {
 	f.serialVersion(0);
 	ITexture::serial(f);
diff --git a/code/nel/src/3d/texture_bump.cpp b/code/nel/src/3d/texture_bump.cpp
index adc425c37..3707476b2 100644
--- a/code/nel/src/3d/texture_bump.cpp
+++ b/code/nel/src/3d/texture_bump.cpp
@@ -162,7 +162,7 @@ void CTextureBump::setHeightMap(ITexture *heightMap)
 
 
 ///==============================================================================================
-void CTextureBump::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CTextureBump::serial(NLMISC::IStream &f)
 {
 	/// version 2 : normalization flag
 	sint ver = f.serialVersion(3);
diff --git a/code/nel/src/3d/texture_cube.cpp b/code/nel/src/3d/texture_cube.cpp
index f754aa2a0..34737af4f 100644
--- a/code/nel/src/3d/texture_cube.cpp
+++ b/code/nel/src/3d/texture_cube.cpp
@@ -147,7 +147,7 @@ void	CTextureCube::release()
 }
 
 // ***************************************************************************
-void	CTextureCube::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void	CTextureCube::serial(NLMISC::IStream &f)
 {
 	sint	ver= f.serialVersion(2);
 
diff --git a/code/nel/src/3d/texture_emboss.cpp b/code/nel/src/3d/texture_emboss.cpp
index 1c9733bda..a106454f4 100644
--- a/code/nel/src/3d/texture_emboss.cpp
+++ b/code/nel/src/3d/texture_emboss.cpp
@@ -47,7 +47,7 @@ void CTextureEmboss::setHeightMap(ITexture *heightMap)
 }
 
 // ***********************************************************************************************************
-void CTextureEmboss::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CTextureEmboss::serial(NLMISC::IStream &f)
 {
 	f.serialVersion(0);
 	ITexture::serial(f);
diff --git a/code/nel/src/3d/texture_file.cpp b/code/nel/src/3d/texture_file.cpp
index a30b21bb1..0e343ec8e 100644
--- a/code/nel/src/3d/texture_file.cpp
+++ b/code/nel/src/3d/texture_file.cpp
@@ -240,7 +240,7 @@ void CTextureFile::doGenerate(bool async)
 
 
 // ***************************************************************************
-void	CTextureFile::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void	CTextureFile::serial(NLMISC::IStream &f)
 {
 	/*
 	Version 1:
diff --git a/code/nel/src/3d/texture_grouped.cpp b/code/nel/src/3d/texture_grouped.cpp
index b6d42f3b1..273d383e8 100644
--- a/code/nel/src/3d/texture_grouped.cpp
+++ b/code/nel/src/3d/texture_grouped.cpp
@@ -309,7 +309,7 @@ std::string		CTextureGrouped::getShareName() const
 }
 
 ///=====================================================================================================
-void CTextureGrouped::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CTextureGrouped::serial(NLMISC::IStream &f)
 {
 	f.serialVersion(1);
 
diff --git a/code/nel/src/3d/texture_multi_file.cpp b/code/nel/src/3d/texture_multi_file.cpp
index b2316cc73..cd05beb55 100644
--- a/code/nel/src/3d/texture_multi_file.cpp
+++ b/code/nel/src/3d/texture_multi_file.cpp
@@ -82,7 +82,7 @@ void CTextureMultiFile::doGenerate(bool async)
 }
 
 ///===========================================================
-void	CTextureMultiFile::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void	CTextureMultiFile::serial(NLMISC::IStream &f)
 {
 	(void)f.serialVersion(0);
 
diff --git a/code/nel/src/3d/tile_bank.cpp b/code/nel/src/3d/tile_bank.cpp
index 1260f3972..e2c488fe5 100644
--- a/code/nel/src/3d/tile_bank.cpp
+++ b/code/nel/src/3d/tile_bank.cpp
@@ -47,7 +47,7 @@ namespace	NL3D
 // ***************************************************************************
 const sint CTileLand::_Version=0;
 // ***************************************************************************
-void CTileLand::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CTileLand::serial(NLMISC::IStream &f)
 {
 	(void)f.serialVersion(_Version);
 
@@ -91,7 +91,7 @@ CTileBank::CTileBank ()
 	_DisplacementMap[0].setEmpty ();
 }
 // ***************************************************************************
-void    CTileBank::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void    CTileBank::serial(NLMISC::IStream &f)
 {
 	f.serialCheck (std::string ("BANK"));
 
@@ -753,7 +753,7 @@ void	CTileBank::postfixTileVegetableDesc (const char *postfix)
 // ***************************************************************************
 const sint CTile::_Version=4;
 // ***************************************************************************
-void CTile::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CTile::serial(NLMISC::IStream &f)
 {
 	sint streamver = f.serialVersion(_Version);
 
@@ -916,7 +916,7 @@ const std::string& CTileSet::getName () const
 	return _Name;
 }
 // ***************************************************************************
-void CTileSet::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CTileSet::serial(NLMISC::IStream &f)
 {
 	sint streamver = f.serialVersion(_Version);
 
@@ -1595,7 +1595,7 @@ void CTileSet::loadTileVegetableDesc()
 // ***************************************************************************
 const sint CTileBorder::_Version=0;
 // ***************************************************************************
-void CTileBorder::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CTileBorder::serial(NLMISC::IStream &f)
 {
 	(void)f.serialVersion(_Version);
 
@@ -1824,7 +1824,7 @@ void CTileBorder::rotate()
 // ***************************************************************************
 const sint CTileSetTransition::_Version=1;
 // ***************************************************************************
-void CTileSetTransition::serial(class NLMISC::IStream &f) throw(EStream)
+void CTileSetTransition::serial(NLMISC::IStream &f)
 {
 	sint streamver = f.serialVersion(_Version);
 
diff --git a/code/nel/src/3d/tile_far_bank.cpp b/code/nel/src/3d/tile_far_bank.cpp
index d8eceb21e..e86f18389 100644
--- a/code/nel/src/3d/tile_far_bank.cpp
+++ b/code/nel/src/3d/tile_far_bank.cpp
@@ -39,7 +39,7 @@ namespace NL3D {
 // ***************************************************************************
 const sint CTileFarBank::CTileFar::_Version=0x0;
 // ***************************************************************************
-void CTileFarBank::CTileFar::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CTileFarBank::CTileFar::serial(NLMISC::IStream &f)
 {
 	// Serial version
 	(void)f.serialVersion(_Version);
@@ -105,7 +105,7 @@ CTileFarBank::CTileFarBank()
 // ***************************************************************************
 const sint CTileFarBank::_Version=0x0;
 // ***************************************************************************
-void CTileFarBank::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CTileFarBank::serial(NLMISC::IStream &f)
 {
 	// Write/Check "FAR_BANK" in header of the stream
 	f.serialCheck (NELID("_RAF"));
diff --git a/code/nel/src/3d/water_height_map.cpp b/code/nel/src/3d/water_height_map.cpp
index 3348ffd05..5f67ffce3 100644
--- a/code/nel/src/3d/water_height_map.cpp
+++ b/code/nel/src/3d/water_height_map.cpp
@@ -674,7 +674,7 @@ void CWaterHeightMap::setWaves(float intensity, float period, uint radius, bool
 
 //===========================================================================================
 
-void CWaterHeightMap::serial(NLMISC::IStream &f)  throw(NLMISC::EStream)
+void CWaterHeightMap::serial(NLMISC::IStream &f)
 {
 	f.xmlPushBegin("WaterHeightMap");
 		f.xmlSetAttrib ("NAME")					;
diff --git a/code/nel/src/3d/water_pool_manager.cpp b/code/nel/src/3d/water_pool_manager.cpp
index 8ca8e2bfc..361264f81 100644
--- a/code/nel/src/3d/water_pool_manager.cpp
+++ b/code/nel/src/3d/water_pool_manager.cpp
@@ -214,7 +214,7 @@ void	CWaterPoolManager::removePool(uint32 ID)
 }
 
 //===============================================================================================
-void CWaterPoolManager::serial(NLMISC::IStream &f)  throw(NLMISC::EStream)
+void CWaterPoolManager::serial(NLMISC::IStream &f)
 {
 	f.xmlPush("WaterPoolManager");
 	(void)f.serialVersion(0);
diff --git a/code/nel/src/3d/water_shape.cpp b/code/nel/src/3d/water_shape.cpp
index df5e6dadf..6df5acb4c 100644
--- a/code/nel/src/3d/water_shape.cpp
+++ b/code/nel/src/3d/water_shape.cpp
@@ -523,7 +523,7 @@ const ITexture		*CWaterShape::getHeightMap(uint k) const
 }
 
 //============================================
-void CWaterShape::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CWaterShape::serial(NLMISC::IStream &f)
 {
 	/* ***********************************************
 	 *	WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance
@@ -763,7 +763,7 @@ CWaveMakerShape::~CWaveMakerShape()
 }
 
 //============================================
-void CWaveMakerShape::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CWaveMakerShape::serial(NLMISC::IStream &f)
 {
 	f.serialVersion(0);
 	f.serial(_Period, _Radius, _Intensity, _PoolID, _ImpulsionMode);
diff --git a/code/nel/src/georges/form.cpp b/code/nel/src/georges/form.cpp
index f5cbcc3a1..a02b9e8cd 100644
--- a/code/nel/src/georges/form.cpp
+++ b/code/nel/src/georges/form.cpp
@@ -263,7 +263,7 @@ const std::string &CForm::getComment () const
 
 // ***************************************************************************
 
-void CForm::write (class NLMISC::IStream &stream)
+void CForm::write (NLMISC::IStream &stream)
 {
 	// Xml stream
 	COXml xmlStream;
diff --git a/code/nel/src/gui/group_html.cpp b/code/nel/src/gui/group_html.cpp
index c9977589f..7b2621b18 100644
--- a/code/nel/src/gui/group_html.cpp
+++ b/code/nel/src/gui/group_html.cpp
@@ -698,6 +698,8 @@ namespace NLGUI
 							}
 							requestTerminated();
 						}
+
+						continue;
 					}
 
 					for (vector<CDataDownload>::iterator it=Curls.begin(); it<Curls.end(); it++)
@@ -871,8 +873,20 @@ namespace NLGUI
 	#ifdef LOG_DL
 		nlwarning("Release Downloads");
 	#endif
-		if(MultiCurl)
-			curl_multi_cleanup(MultiCurl);
+
+		// remove all queued and already started downloads
+		for (uint i = 0; i < Curls.size(); ++i)
+		{
+			if (Curls[i].data)
+			{
+				if (MultiCurl)
+					curl_multi_remove_handle(MultiCurl, Curls[i].data->Request);
+
+				// release CCurlWWWData
+				delete Curls[i].data;
+			}
+		}
+		Curls.clear();
 	}
 
 	class CGroupListAdaptor : public CInterfaceGroup
@@ -3059,8 +3073,13 @@ namespace NLGUI
 					   //     this is why the call to 'updateRefreshButton' has been removed from stopBrowse
 
 		clearContext();
+		releaseDownloads();
+
 		if (_CurlWWW)
 			delete _CurlWWW;
+
+		if(MultiCurl)
+			curl_multi_cleanup(MultiCurl);
 	}
 
 	std::string CGroupHTML::getProperty( const std::string &name ) const
@@ -4657,7 +4676,6 @@ namespace NLGUI
 				if(!CFile::fileExists(normal))
 				{
 					normal = "web_del.tga";
-					addImageDownload(normalBitmap, ctrlButton, style);
 				}
 				else
 				{
@@ -4674,6 +4692,8 @@ namespace NLGUI
 						normal = "web_del.tga";
 					}
 				}
+
+				addImageDownload(normalBitmap, ctrlButton, style);
 			}
 		}
 
@@ -4698,10 +4718,7 @@ namespace NLGUI
 			if (overBitmap != normalBitmap)
 			{
 				over = localImageName(overBitmap);
-				if (!CFile::fileExists(over))
-				{
-					addImageDownload(overBitmap, ctrlButton, style, TImageType::OverImage);
-				}
+				addImageDownload(overBitmap, ctrlButton, style, TImageType::OverImage);
 			}
 		}
 
diff --git a/code/nel/src/gui/group_menu.cpp b/code/nel/src/gui/group_menu.cpp
index d2e11a2c9..7d002cfd6 100644
--- a/code/nel/src/gui/group_menu.cpp
+++ b/code/nel/src/gui/group_menu.cpp
@@ -1802,7 +1802,7 @@ namespace NLGUI
 		return 0;
 	}
 
-		// ------------------------------------------------------------------------------------------------
+	// ------------------------------------------------------------------------------------------------
 	int CGroupSubMenu::luaAddIconLine(CLuaState &ls)
 	{
 		const char *funcName = "addIconLine";
diff --git a/code/nel/src/gui/http_hsts.cpp b/code/nel/src/gui/http_hsts.cpp
index 980bdabda..c69062538 100644
--- a/code/nel/src/gui/http_hsts.cpp
+++ b/code/nel/src/gui/http_hsts.cpp
@@ -55,7 +55,7 @@ namespace NLGUI {
 			time_t currentTime;
 			time(&currentTime);
 
-			return (hsts.Expires < currentTime);
+			return (hsts.Expires > currentTime);
 		}
 
 		return false;
diff --git a/code/nel/src/gui/lua_ihm.cpp b/code/nel/src/gui/lua_ihm.cpp
index fed1340a0..0b4a1d0dc 100644
--- a/code/nel/src/gui/lua_ihm.cpp
+++ b/code/nel/src/gui/lua_ihm.cpp
@@ -1817,9 +1817,7 @@ namespace NLGUI
 	ucstring		CLuaIHM::findReplaceAll(const ucstring &str,   const ucstring &search,   const ucstring &replace)
 	{
 		//H_AUTO(Lua_CLuaIHM_findReplaceAll)
-		ucstring	ret= str;
-		while(strFindReplace(ret,   search,   replace));
-		return ret;
+		return strFindReplaceAll(str, search, replace);
 	}
 
 	// ***************************************************************************
diff --git a/code/nel/src/misc/bitmap_gif.cpp b/code/nel/src/misc/bitmap_gif.cpp
index 5b964998a..653942d08 100644
--- a/code/nel/src/misc/bitmap_gif.cpp
+++ b/code/nel/src/misc/bitmap_gif.cpp
@@ -215,9 +215,6 @@ uint8 CBitmap::readGIF( NLMISC::IStream &f )
 
 					for (uint32 x = 0; x < width; x++)
 					{
-						srcOffset++;
-						dstOffset+= dstChannels;
-
 						uint32 index = curFrame->RasterBits[srcOffset];
 
 						if ((sint32)index != transparency)
@@ -250,6 +247,9 @@ uint8 CBitmap::readGIF( NLMISC::IStream &f )
 						_Data[0][dstOffset+1] = g;
 						_Data[0][dstOffset+2] = b;
 						_Data[0][dstOffset+3] = a;
+
+						srcOffset++;
+						dstOffset+= dstChannels;
 					} // x loop
 				} // y loop
 			} // pass loop
@@ -262,9 +262,6 @@ uint8 CBitmap::readGIF( NLMISC::IStream &f )
 			uint32 dstOffset = (y + offset_y)*gif->SWidth*dstChannels + offset_x*dstChannels;
 			for (uint32 x = 0; x < width; x++)
 			{
-				srcOffset++;
-				dstOffset+= dstChannels;
-
 				uint32 index = curFrame->RasterBits[srcOffset];
 
 				if ((sint32)index != transparency)
@@ -297,6 +294,9 @@ uint8 CBitmap::readGIF( NLMISC::IStream &f )
 				_Data[0][dstOffset+1] = g;
 				_Data[0][dstOffset+2] = b;
 				_Data[0][dstOffset+3] = a;
+
+				srcOffset++;
+				dstOffset+= dstChannels;
 			} // x loop
 		} // y loop
 	}
diff --git a/code/nel/src/misc/bitmap_png.cpp b/code/nel/src/misc/bitmap_png.cpp
index 251fd5495..2e700787c 100644
--- a/code/nel/src/misc/bitmap_png.cpp
+++ b/code/nel/src/misc/bitmap_png.cpp
@@ -37,8 +37,16 @@ namespace NLMISC
 static void readPNGData(png_structp png_ptr, png_bytep data, png_size_t length)
 {
 	IStream *stream = static_cast<IStream*>(png_get_io_ptr(png_ptr));
-	if (stream)
-		stream->serialBuffer((uint8*)data, (uint)length);
+
+	try
+	{
+		if (stream)
+			stream->serialBuffer((uint8*)data, (uint)length);
+	}
+	catch (...)
+	{
+		png_error(png_ptr, "Read error while decoding PNG file");
+	}
 }
 
 static void writePNGData(png_structp png_ptr, png_bytep data, png_size_t length)
diff --git a/code/nel/src/misc/common.cpp b/code/nel/src/misc/common.cpp
index 7eebdafbf..db605f4f1 100644
--- a/code/nel/src/misc/common.cpp
+++ b/code/nel/src/misc/common.cpp
@@ -633,7 +633,7 @@ void toLower(char *str)
 	}
 }
 
-std::string	toUpper(const std::string &str)
+std::string toUpper(const std::string &str)
 {
 	string res;
 	res.reserve(str.size());
@@ -647,7 +647,7 @@ std::string	toUpper(const std::string &str)
 	return res;
 }
 
-void		toUpper(char *str)
+void toUpper(char *str)
 {
 	if (str == 0)
 		return;
@@ -662,6 +662,109 @@ void		toUpper(char *str)
 	}
 }
 
+std::string toHexa(const uint8 &b)
+{
+	return toString("%02hhx", b);
+}
+
+std::string toHexa(const uint8 *data, uint size)
+{
+	std::string res;
+
+	// hexadecimal string will be always twice the original size
+	res.reserve(size * 2);
+
+	// process each byte
+	for (uint i = 0; i < size; ++i)
+	{
+		res += toHexa(data[i]);
+	}
+
+	return res;
+}
+
+std::string toHexa(const std::string &str)
+{
+	return toHexa((uint8*)str.c_str(), (uint)str.length());
+}
+
+std::string toHexa(const char *str)
+{
+	return toHexa((uint8*)str, (uint)strlen(str));
+}
+
+bool fromHexa(const std::string &hexa, uint8 &b)
+{
+	return fromHexa(hexa.c_str(), b);
+}
+
+bool fromHexa(const std::string &hexa, uint8 *data)
+{
+	return fromHexa(hexa.c_str(), data);
+}
+
+bool fromHexa(const std::string &hexa, std::string &str)
+{
+	return fromHexa(hexa.c_str(), str);
+}
+
+bool fromHexa(const char *hexa, uint8 &b)
+{
+	char c1 = *hexa;
+	char c2 = *(hexa+1);
+	uint8 x1, x2;
+	if (!fromHexa(c1, x1)) return false;
+	if (!fromHexa(c2, x2)) return false;
+	
+	b = (x1 << 4) | x2;
+
+	return true;
+}
+
+bool fromHexa(const char *hexa, uint8 *data)
+{
+	// length of the string
+	uint len = strlen(hexa);
+
+	// process each byte
+	for (uint i = 0; i < len; i += 2)
+	{
+		if (!fromHexa(hexa + i, *(data++))) return false;
+	}
+
+	return true;
+}
+
+bool fromHexa(const char *hexa, std::string &str)
+{
+	str.resize(strlen(hexa) * 2);
+
+	return fromHexa(hexa, (uint8*)str.c_str());
+}
+
+bool fromHexa(const char hexa, uint8 &b)
+{
+	if (hexa >= '0' && hexa <= '9')
+	{
+		b = hexa - '0';
+		return true;
+	}
+	
+	if (hexa >= 'A' && hexa <= 'F')
+	{
+		b = hexa - 'A' + 10;
+		return true;
+	}
+	
+	if (hexa >= 'a' && hexa <= 'f')
+	{
+		b = hexa - 'a' + 10;
+		return true;
+	}
+
+	return false;
+}
+
 std::string formatThousands(const std::string& s)
 {
 	sint i, k;
@@ -894,8 +997,8 @@ bool launchProgram(const std::string &programName, const std::string &arguments,
 	
 	int status = vfork ();
 	/////////////////////////////////////////////////////////
-	/// WARNING : NO MORE INSTRUCTION AFTER VFORK !
-	/// READ VFORK manual
+	// WARNING : NO MORE INSTRUCTION AFTER VFORK !
+	// READ VFORK manual
 	/////////////////////////////////////////////////////////
 	if (status == -1)
 	{
@@ -1000,8 +1103,8 @@ bool launchProgramArray (const std::string &programName, const std::vector<std::
 	
 	int status = vfork ();
 	/////////////////////////////////////////////////////////
-	/// WARNING : NO MORE INSTRUCTION AFTER VFORK !
-	/// READ VFORK manual
+	// WARNING : NO MORE INSTRUCTION AFTER VFORK !
+	// READ VFORK manual
 	/////////////////////////////////////////////////////////
 	if (status == -1)
 	{
@@ -1247,6 +1350,41 @@ std::string joinArguments(const std::vector<std::string> &args)
 	return res;
 }
 
+std::string escapeArgument(const std::string &arg)
+{
+#ifdef NL_OS_WINDOWS
+	// we can't escape %VARIABLE% on command-line under Windows
+	return arg;
+#else
+	// characters to escape, only " and $ (to prevent a $something replaced by an environment variable)
+	static const char s_charsToEscape[] = "\"$";
+
+	std::string res;
+	std::string::size_type pos = 0, lastPos = 0;
+
+	// to avoid reallocations
+	res.reserve(arg.size() * 2);
+
+	while ((pos = arg.find_first_of(s_charsToEscape, lastPos)) != std::string::npos)
+	{
+		// add previous part
+		res += arg.substr(lastPos, pos - lastPos);
+		
+		// not already escaped
+		if (!pos || arg[pos - 1] != '\\') res += '\\';
+
+		// add escaped character
+		res += arg[pos];
+
+		lastPos = pos+1;
+	}
+
+	res += arg.substr(lastPos);
+
+	return res;
+#endif
+}
+
 /*
  * Display the bits (with 0 and 1) composing a byte (from right to left)
  */
diff --git a/code/nel/src/misc/md5.cpp b/code/nel/src/misc/md5.cpp
index eaf9df6cc..052bfa0b2 100644
--- a/code/nel/src/misc/md5.cpp
+++ b/code/nel/src/misc/md5.cpp
@@ -118,31 +118,6 @@ CHashKeyMD5 getMD5(const uint8 *buffer, uint32 size)
 	return Message_Digest;
 }
 
-// ****************************************************************************
-// Helper
-// ****************************************************************************
-static bool fromHex(char c, uint8 &x)
-{
-	if (c >= '0' && c <= '9')
-	{
-		x = c - '0';
-		return true;
-	}
-	else if (c >= 'A' && c <= 'F')
-	{
-		x = c - 'A' + 10;
-		return true;
-	}
-	else if (c >= 'a' && c <= 'f')
-	{
-		x = c - 'a' + 10;
-		return true;
-	}
-
-	nlwarning("cannot convert to hexa");
-	return false;
-}
-
 // ****************************************************************************
 // ****************************************************************************
 // CHashKeyMD5
@@ -159,10 +134,7 @@ void CHashKeyMD5::clear()
 // ****************************************************************************
 string CHashKeyMD5::toString() const
 {
-	string sTmp;
-	for (uint32 i = 0; i < 16; ++i)
-		sTmp += NLMISC::toString("%02x", Data[i]);
-	return sTmp;
+	return toHexa(Data, 16);
 }
 
 // ****************************************************************************
@@ -174,16 +146,7 @@ bool CHashKeyMD5::fromString(const std::string &in)
 		return false;
 	}
 
-	for (uint32 i = 0; i < 16; ++i)
-	{
-		char c1 = in[2*i];
-		char c2 = in[2*i+1];
-		uint8 x1, x2;
-		if (!fromHex(c1, x1)) return false;
-		if (!fromHex(c2, x2)) return false;
-		Data[i] = (x1 << 4) | x2;
-	}
-	return true;
+	return fromHexa(in, Data);
 }
 
 // ****************************************************************************
diff --git a/code/nel/src/misc/polygon.cpp b/code/nel/src/misc/polygon.cpp
index 16575073f..856255c34 100644
--- a/code/nel/src/misc/polygon.cpp
+++ b/code/nel/src/misc/polygon.cpp
@@ -113,7 +113,7 @@ void			CPolygon::clip(const std::vector<CPlane> &planes)
 
 
 // ***************************************************************************
-void CPolygon::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPolygon::serial(NLMISC::IStream &f)
 {
 	f.serialVersion(0);
 	f.serialCont(Vertices);
@@ -1011,7 +1011,7 @@ void		CPolygon2D::buildConvexHull(CPolygon2D &dest) const
 // ***************************************************************************
 
 
-void CPolygon2D::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPolygon2D::serial(NLMISC::IStream &f)
 {
 	(void)f.serialVersion(0);
 	f.serialCont(Vertices);
diff --git a/code/nel/src/misc/rgba.cpp b/code/nel/src/misc/rgba.cpp
index d053887c4..277793489 100644
--- a/code/nel/src/misc/rgba.cpp
+++ b/code/nel/src/misc/rgba.cpp
@@ -50,7 +50,7 @@ const CRGBA CRGBA::Cyan(0, 255, 255) ;
 const CRGBA CRGBA::White(255, 255, 255) ;
 
 // ***************************************************************************
-void CRGBA::serial(class NLMISC::IStream &f)
+void CRGBA::serial(NLMISC::IStream &f)
 {
 	f.serial (R);
 	f.serial (G);
@@ -581,7 +581,7 @@ void CRGBA::subtractColors(CRGBA *dest, const CRGBA *src1, const CRGBA *src2, ui
 
 
 // ***************************************************************************
-void CBGRA::serial(class NLMISC::IStream &f)
+void CBGRA::serial(NLMISC::IStream &f)
 {
 	f.serial (B);
 	f.serial (G);
@@ -792,7 +792,7 @@ bool CRGBA::fromString( const std::string &s )
 
 
 // ***************************************************************************
-void CRGBAF::serial(class NLMISC::IStream &f)
+void CRGBAF::serial(NLMISC::IStream &f)
 {
 	f.serial (R);
 	f.serial (G);
diff --git a/code/nel/src/misc/sheet_id.cpp b/code/nel/src/misc/sheet_id.cpp
index 1b3ca490f..2dd895153 100644
--- a/code/nel/src/misc/sheet_id.cpp
+++ b/code/nel/src/misc/sheet_id.cpp
@@ -561,7 +561,7 @@ string CSheetId::toString(bool ifNotFoundUseNumericId) const
 
 } // toString //
 
-void CSheetId::serial(NLMISC::IStream	&f) throw(NLMISC::EStream)
+void CSheetId::serial(NLMISC::IStream	&f)
 {
 	nlassert(!_DontHaveSheetKnowledge);
 
@@ -576,7 +576,7 @@ void CSheetId::serial(NLMISC::IStream	&f) throw(NLMISC::EStream)
 #endif
 }
 
-void CSheetId::serialString(NLMISC::IStream &f, const std::string &defaultType) throw(NLMISC::EStream)
+void CSheetId::serialString(NLMISC::IStream &f, const std::string &defaultType)
 {
 	nlassert(_Initialised);
 	
diff --git a/code/nel/src/misc/system_info.cpp b/code/nel/src/misc/system_info.cpp
index 545de0cc6..2afa8da09 100644
--- a/code/nel/src/misc/system_info.cpp
+++ b/code/nel/src/misc/system_info.cpp
@@ -23,6 +23,156 @@
 #	include <tchar.h>
 #	include <intrin.h>
 #	define nlcpuid(regs, idx) __cpuid(regs, idx)
+
+// define them here to not rely on Windows 10 SDKs
+#	define NL_PRODUCT_UNDEFINED                           0x00000000
+#	define NL_PRODUCT_ULTIMATE                            0x00000001
+#	define NL_PRODUCT_HOME_BASIC                          0x00000002
+#	define NL_PRODUCT_HOME_PREMIUM                        0x00000003
+#	define NL_PRODUCT_ENTERPRISE                          0x00000004
+#	define NL_PRODUCT_HOME_BASIC_N                        0x00000005
+#	define NL_PRODUCT_BUSINESS                            0x00000006
+#	define NL_PRODUCT_STANDARD_SERVER                     0x00000007
+#	define NL_PRODUCT_DATACENTER_SERVER                   0x00000008
+#	define NL_PRODUCT_SMALLBUSINESS_SERVER                0x00000009
+#	define NL_PRODUCT_ENTERPRISE_SERVER                   0x0000000A
+#	define NL_PRODUCT_STARTER                             0x0000000B
+#	define NL_PRODUCT_DATACENTER_SERVER_CORE              0x0000000C
+#	define NL_PRODUCT_STANDARD_SERVER_CORE                0x0000000D
+#	define NL_PRODUCT_ENTERPRISE_SERVER_CORE              0x0000000E
+#	define NL_PRODUCT_ENTERPRISE_SERVER_IA64              0x0000000F
+#	define NL_PRODUCT_BUSINESS_N                          0x00000010
+#	define NL_PRODUCT_WEB_SERVER                          0x00000011
+#	define NL_PRODUCT_CLUSTER_SERVER                      0x00000012
+#	define NL_PRODUCT_HOME_SERVER                         0x00000013
+#	define NL_PRODUCT_STORAGE_EXPRESS_SERVER              0x00000014
+#	define NL_PRODUCT_STORAGE_STANDARD_SERVER             0x00000015
+#	define NL_PRODUCT_STORAGE_WORKGROUP_SERVER            0x00000016
+#	define NL_PRODUCT_STORAGE_ENTERPRISE_SERVER           0x00000017
+#	define NL_PRODUCT_SERVER_FOR_SMALLBUSINESS            0x00000018
+#	define NL_PRODUCT_SMALLBUSINESS_SERVER_PREMIUM        0x00000019
+#	define NL_PRODUCT_HOME_PREMIUM_N                      0x0000001A
+#	define NL_PRODUCT_ENTERPRISE_N                        0x0000001B
+#	define NL_PRODUCT_ULTIMATE_N                          0x0000001C
+#	define NL_PRODUCT_WEB_SERVER_CORE                     0x0000001D
+#	define NL_PRODUCT_MEDIUMBUSINESS_SERVER_MANAGEMENT    0x0000001E
+#	define NL_PRODUCT_MEDIUMBUSINESS_SERVER_SECURITY      0x0000001F
+#	define NL_PRODUCT_MEDIUMBUSINESS_SERVER_MESSAGING     0x00000020
+#	define NL_PRODUCT_SERVER_FOUNDATION                   0x00000021
+#	define NL_PRODUCT_HOME_PREMIUM_SERVER                 0x00000022
+#	define NL_PRODUCT_SERVER_FOR_SMALLBUSINESS_V          0x00000023
+#	define NL_PRODUCT_STANDARD_SERVER_V                   0x00000024
+#	define NL_PRODUCT_DATACENTER_SERVER_V                 0x00000025
+#	define NL_PRODUCT_ENTERPRISE_SERVER_V                 0x00000026
+#	define NL_PRODUCT_DATACENTER_SERVER_CORE_V            0x00000027
+#	define NL_PRODUCT_STANDARD_SERVER_CORE_V              0x00000028
+#	define NL_PRODUCT_ENTERPRISE_SERVER_CORE_V            0x00000029
+#	define NL_PRODUCT_HYPERV                              0x0000002A
+#	define NL_PRODUCT_STORAGE_EXPRESS_SERVER_CORE         0x0000002B
+#	define NL_PRODUCT_STORAGE_STANDARD_SERVER_CORE        0x0000002C
+#	define NL_PRODUCT_STORAGE_WORKGROUP_SERVER_CORE       0x0000002D
+#	define NL_PRODUCT_STORAGE_ENTERPRISE_SERVER_CORE      0x0000002E
+#	define NL_PRODUCT_STARTER_N                           0x0000002F
+#	define NL_PRODUCT_PROFESSIONAL                        0x00000030
+#	define NL_PRODUCT_PROFESSIONAL_N                      0x00000031
+#	define NL_PRODUCT_SB_SOLUTION_SERVER                  0x00000032
+#	define NL_PRODUCT_SERVER_FOR_SB_SOLUTIONS             0x00000033
+#	define NL_PRODUCT_STANDARD_SERVER_SOLUTIONS           0x00000034
+#	define NL_PRODUCT_STANDARD_SERVER_SOLUTIONS_CORE      0x00000035
+#	define NL_PRODUCT_SB_SOLUTION_SERVER_EM               0x00000036
+#	define NL_PRODUCT_SERVER_FOR_SB_SOLUTIONS_EM          0x00000037
+#	define NL_PRODUCT_SOLUTION_EMBEDDEDSERVER             0x00000038
+#	define NL_PRODUCT_SOLUTION_EMBEDDEDSERVER_CORE        0x00000039
+#	define NL_PRODUCT_PROFESSIONAL_EMBEDDED               0x0000003A
+#	define NL_PRODUCT_ESSENTIALBUSINESS_SERVER_MGMT       0x0000003B
+#	define NL_PRODUCT_ESSENTIALBUSINESS_SERVER_ADDL       0x0000003C
+#	define NL_PRODUCT_ESSENTIALBUSINESS_SERVER_MGMTSVC    0x0000003D
+#	define NL_PRODUCT_ESSENTIALBUSINESS_SERVER_ADDLSVC    0x0000003E
+#	define NL_PRODUCT_SMALLBUSINESS_SERVER_PREMIUM_CORE   0x0000003F
+#	define NL_PRODUCT_CLUSTER_SERVER_V                    0x00000040
+#	define NL_PRODUCT_EMBEDDED                            0x00000041
+#	define NL_PRODUCT_STARTER_E                           0x00000042
+#	define NL_PRODUCT_HOME_BASIC_E                        0x00000043
+#	define NL_PRODUCT_HOME_PREMIUM_E                      0x00000044
+#	define NL_PRODUCT_PROFESSIONAL_E                      0x00000045
+#	define NL_PRODUCT_ENTERPRISE_E                        0x00000046
+#	define NL_PRODUCT_ULTIMATE_E                          0x00000047
+#	define NL_PRODUCT_ENTERPRISE_EVALUATION               0x00000048
+#	define NL_PRODUCT_MULTIPOINT_STANDARD_SERVER          0x0000004C
+#	define NL_PRODUCT_MULTIPOINT_PREMIUM_SERVER           0x0000004D
+#	define NL_PRODUCT_STANDARD_EVALUATION_SERVER          0x0000004F
+#	define NL_PRODUCT_DATACENTER_EVALUATION_SERVER        0x00000050
+#	define NL_PRODUCT_ENTERPRISE_N_EVALUATION             0x00000054
+#	define NL_PRODUCT_EMBEDDED_AUTOMOTIVE                 0x00000055
+#	define NL_PRODUCT_EMBEDDED_INDUSTRY_A                 0x00000056
+#	define NL_PRODUCT_THINPC                              0x00000057
+#	define NL_PRODUCT_EMBEDDED_A                          0x00000058
+#	define NL_PRODUCT_EMBEDDED_INDUSTRY                   0x00000059
+#	define NL_PRODUCT_EMBEDDED_E                          0x0000005A
+#	define NL_PRODUCT_EMBEDDED_INDUSTRY_E                 0x0000005B
+#	define NL_PRODUCT_EMBEDDED_INDUSTRY_A_E               0x0000005C
+#	define NL_PRODUCT_STORAGE_WORKGROUP_EVALUATION_SERVER 0x0000005F
+#	define NL_PRODUCT_STORAGE_STANDARD_EVALUATION_SERVER  0x00000060
+#	define NL_PRODUCT_CORE_ARM                            0x00000061
+#	define NL_PRODUCT_CORE_N                              0x00000062
+#	define NL_PRODUCT_CORE_COUNTRYSPECIFIC                0x00000063
+#	define NL_PRODUCT_CORE_SINGLELANGUAGE                 0x00000064
+#	define NL_PRODUCT_CORE                                0x00000065
+#	define NL_PRODUCT_PROFESSIONAL_WMC                    0x00000067
+#	define NL_PRODUCT_MOBILE_CORE                         0x00000068
+#	define NL_PRODUCT_EMBEDDED_INDUSTRY_EVAL              0x00000069
+#	define NL_PRODUCT_EMBEDDED_INDUSTRY_E_EVAL            0x0000006A
+#	define NL_PRODUCT_EMBEDDED_EVAL                       0x0000006B
+#	define NL_PRODUCT_EMBEDDED_E_EVAL                     0x0000006C
+#	define NL_PRODUCT_CORE_SERVER                         0x0000006D
+#	define NL_PRODUCT_CLOUD_STORAGE_SERVER                0x0000006E
+#	define NL_PRODUCT_CORE_CONNECTED                      0x0000006F
+#	define NL_PRODUCT_PROFESSIONAL_STUDENT                0x00000070
+#	define NL_PRODUCT_CORE_CONNECTED_N                    0x00000071
+#	define NL_PRODUCT_PROFESSIONAL_STUDENT_N              0x00000072
+#	define NL_PRODUCT_CORE_CONNECTED_SINGLELANGUAGE       0x00000073
+#	define NL_PRODUCT_CORE_CONNECTED_COUNTRYSPECIFIC      0x00000074
+#	define NL_PRODUCT_CONNECTED_CAR                       0x00000075
+#	define NL_PRODUCT_INDUSTRY_HANDHELD                   0x00000076
+#	define NL_PRODUCT_PPI_PRO                             0x00000077
+#	define NL_PRODUCT_ARM64_SERVER                        0x00000078
+#	define NL_PRODUCT_EDUCATION                           0x00000079
+#	define NL_PRODUCT_EDUCATION_N                         0x0000007A
+#	define NL_PRODUCT_IOTUAP                              0x0000007B
+#	define NL_PRODUCT_CLOUD_HOST_INFRASTRUCTURE_SERVER    0x0000007C
+#	define NL_PRODUCT_ENTERPRISE_S                        0x0000007D
+#	define NL_PRODUCT_ENTERPRISE_S_N                      0x0000007E
+#	define NL_PRODUCT_PROFESSIONAL_S                      0x0000007F
+#	define NL_PRODUCT_PROFESSIONAL_S_N                    0x00000080
+#	define NL_PRODUCT_ENTERPRISE_S_EVALUATION             0x00000081
+#	define NL_PRODUCT_ENTERPRISE_S_N_EVALUATION           0x00000082
+#	define NL_PRODUCT_HOLOGRAPHIC                         0x00000087
+#	define NL_PRODUCT_PRO_SINGLE_LANGUAGE                 0x0000008A
+#	define NL_PRODUCT_PRO_CHINA                           0x0000008B
+#	define NL_PRODUCT_ENTERPRISE_SUBSCRIPTION             0x0000008C
+#	define NL_PRODUCT_ENTERPRISE_SUBSCRIPTION_N           0x0000008D
+#	define NL_PRODUCT_DATACENTER_NANO_SERVER              0x0000008F
+#	define NL_PRODUCT_STANDARD_NANO_SERVER                0x00000090
+#	define NL_PRODUCT_DATACENTER_A_SERVER_CORE            0x00000091
+#	define NL_PRODUCT_STANDARD_A_SERVER_CORE              0x00000092
+#	define NL_PRODUCT_DATACENTER_WS_SERVER_CORE           0x00000093
+#	define NL_PRODUCT_STANDARD_WS_SERVER_CORE             0x00000094
+#	define NL_PRODUCT_UTILITY_VM                          0x00000095
+#	define NL_PRODUCT_DATACENTER_EVALUATION_SERVER_CORE   0x0000009F
+#	define NL_PRODUCT_STANDARD_EVALUATION_SERVER_CORE     0x000000A0
+#	define NL_PRODUCT_PRO_WORKSTATION                     0x000000A1
+#	define NL_PRODUCT_PRO_WORKSTATION_N                   0x000000A2
+#	define NL_PRODUCT_PRO_FOR_EDUCATION                   0x000000A4
+#	define NL_PRODUCT_PRO_FOR_EDUCATION_N                 0x000000A5
+#	define NL_PRODUCT_AZURE_SERVER_CORE                   0x000000A8
+#	define NL_PRODUCT_AZURE_NANO_SERVER                   0x000000A9
+#	define NL_PRODUCT_ENTERPRISEG                         0x000000AB
+#	define NL_PRODUCT_ENTERPRISEGN                        0x000000AC
+#	define NL_PRODUCT_SERVERRDSH                          0x000000AF
+#	define NL_PRODUCT_CLOUD                               0x000000B2
+#	define NL_PRODUCT_CLOUDN                              0x000000B3
+#	define NL_PRODUCT_UNLICENSED						  0xABCDABCD
+
 #else
 #	include <sys/types.h>
 #	include <sys/stat.h>
@@ -443,544 +593,461 @@ string CSystemInfo::getOS()
 		if (pGetProductInfo && pGetProductInfo(osvi.dwMajorVersion, osvi.dwMinorVersion, osvi.wServicePackMajor, osvi.wServicePackMinor, &dwType))
 		{
 			// Test for the specific product family.
+			// see https://msdn.microsoft.com/fr-fr/library/windows/desktop/ms724358(v=vs.85).aspx
 			switch (dwType)
 			{
-#ifdef PRODUCT_UNLICENSED
-			case PRODUCT_UNLICENSED:
+			case NL_PRODUCT_UNLICENSED:
 				OSString += " Unlicensed";
 				break;
-#endif
-#ifdef PRODUCT_ULTIMATE
-			case PRODUCT_ULTIMATE:
+			case NL_PRODUCT_ULTIMATE:
 				OSString += " Ultimate";
 				break;
-#endif
-#ifdef PRODUCT_HOME_BASIC
-			case PRODUCT_HOME_BASIC:
+			case NL_PRODUCT_HOME_BASIC:
 				OSString += " Home Basic";
 				break;
-#endif
-#ifdef PRODUCT_HOME_PREMIUM
-			case PRODUCT_HOME_PREMIUM:
+			case NL_PRODUCT_HOME_PREMIUM:
 				OSString += " Home Premium";
 				break;
-#endif
-#ifdef PRODUCT_ENTERPRISE
-			case PRODUCT_ENTERPRISE:
+			case NL_PRODUCT_ENTERPRISE:
 				OSString += " Enterprise";
 				break;
-#endif
-#ifdef PRODUCT_HOME_BASIC_N
-			case PRODUCT_HOME_BASIC_N:
+			case NL_PRODUCT_HOME_BASIC_N:
 				OSString += " Home Basic N";
 				break;
-#endif
-#ifdef PRODUCT_BUSINESS
-			case PRODUCT_BUSINESS:
+			case NL_PRODUCT_BUSINESS:
 				OSString += " Business";
 				break;
-#endif
-#ifdef PRODUCT_STANDARD_SERVER
-			case PRODUCT_STANDARD_SERVER:
+			case NL_PRODUCT_STANDARD_SERVER:
 				OSString += " Server Standard";
 				break;
-#endif
-#ifdef PRODUCT_DATACENTER_SERVER
-			case PRODUCT_DATACENTER_SERVER:
+			case NL_PRODUCT_DATACENTER_SERVER:
 				OSString += " Server Datacenter (full installation)";
 				break;
-#endif
-#ifdef PRODUCT_SMALLBUSINESS_SERVER
-			case PRODUCT_SMALLBUSINESS_SERVER:
+			case NL_PRODUCT_SMALLBUSINESS_SERVER:
 				OSString += " Small Business Server";
 				break;
-#endif
-#ifdef PRODUCT_ENTERPRISE_SERVER
-			case PRODUCT_ENTERPRISE_SERVER:
+			case NL_PRODUCT_ENTERPRISE_SERVER:
 				OSString += " Server Enterprise (full installation)";
 				break;
-#endif
-#ifdef PRODUCT_STARTER
-			case PRODUCT_STARTER:
+			case NL_PRODUCT_STARTER:
 				OSString += " Starter";
 				break;
-#endif
-#ifdef PRODUCT_DATACENTER_SERVER_CORE
-			case PRODUCT_DATACENTER_SERVER_CORE:
+			case NL_PRODUCT_DATACENTER_SERVER_CORE:
 				OSString += " Server Datacenter (core installation)";
 				break;
-#endif
-#ifdef PRODUCT_STANDARD_SERVER_CORE
-			case PRODUCT_STANDARD_SERVER_CORE:
+			case NL_PRODUCT_STANDARD_SERVER_CORE:
 				OSString += " Server Standard (core installation)";
 				break;
-#endif
-#ifdef PRODUCT_ENTERPRISE_SERVER_CORE
-			case PRODUCT_ENTERPRISE_SERVER_CORE:
+			case NL_PRODUCT_ENTERPRISE_SERVER_CORE:
 				OSString += " Server Enterprise (core installation)";
 				break;
-#endif
-#ifdef PRODUCT_ENTERPRISE_SERVER_IA64
-			case PRODUCT_ENTERPRISE_SERVER_IA64:
+			case NL_PRODUCT_ENTERPRISE_SERVER_IA64:
 				OSString += " Server Enterprise for Itanium-based Systems";
 				break;
-#endif
-#ifdef PRODUCT_BUSINESS_N
-			case PRODUCT_BUSINESS_N:
+			case NL_PRODUCT_BUSINESS_N:
 				OSString += " Business N";
 				break;
-#endif
-#ifdef PRODUCT_WEB_SERVER
-			case PRODUCT_WEB_SERVER:
+			case NL_PRODUCT_WEB_SERVER:
 				OSString += " Web Server (full installation)";
 				break;
-#endif
-#ifdef PRODUCT_CLUSTER_SERVER
-			case PRODUCT_CLUSTER_SERVER:
+			case NL_PRODUCT_CLUSTER_SERVER:
 				OSString += " Server Hyper Core";
 				break;
-#endif
-#ifdef PRODUCT_HOME_SERVER
-			case PRODUCT_HOME_SERVER:
+			case NL_PRODUCT_HOME_SERVER:
 				OSString += " Home Server";
 				break;
-#endif
-#ifdef PRODUCT_STORAGE_EXPRESS_SERVER
-			case PRODUCT_STORAGE_EXPRESS_SERVER:
+			case NL_PRODUCT_STORAGE_EXPRESS_SERVER:
 				OSString += " Storage Server Express";
 				break;
-#endif
-#ifdef PRODUCT_STORAGE_STANDARD_SERVER
-			case PRODUCT_STORAGE_STANDARD_SERVER:
+			case NL_PRODUCT_STORAGE_STANDARD_SERVER:
 				OSString += " Storage Server Standard";
 				break;
-#endif
-#ifdef PRODUCT_STORAGE_WORKGROUP_SERVER
-			case PRODUCT_STORAGE_WORKGROUP_SERVER:
+			case NL_PRODUCT_STORAGE_WORKGROUP_SERVER:
 				OSString += " Storage Server Workgroup";
 				break;
-#endif
-#ifdef PRODUCT_STORAGE_ENTERPRISE_SERVER
-			case PRODUCT_STORAGE_ENTERPRISE_SERVER:
+			case NL_PRODUCT_STORAGE_ENTERPRISE_SERVER:
 				OSString += " Storage Server Enterprise";
 				break;
-#endif
-#ifdef PRODUCT_SERVER_FOR_SMALLBUSINESS
-			case PRODUCT_SERVER_FOR_SMALLBUSINESS:
+			case NL_PRODUCT_SERVER_FOR_SMALLBUSINESS:
 				OSString += " Essential Server Solutions";
 				break;
-#endif
-#ifdef PRODUCT_SMALLBUSINESS_SERVER_PREMIUM
-			case PRODUCT_SMALLBUSINESS_SERVER_PREMIUM:
+			case NL_PRODUCT_SMALLBUSINESS_SERVER_PREMIUM:
 				OSString += " Small Business Server Premium";
 				break;
-#endif
-#ifdef PRODUCT_HOME_PREMIUM_N
-			case PRODUCT_HOME_PREMIUM_N:
+			case NL_PRODUCT_HOME_PREMIUM_N:
 				OSString += " Home Premium N";
 				break;
-#endif
-#ifdef PRODUCT_ENTERPRISE_N
-			case PRODUCT_ENTERPRISE_N:
+			case NL_PRODUCT_ENTERPRISE_N:
 				OSString += " Enterprise N";
 				break;
-#endif
-#ifdef PRODUCT_ULTIMATE_N
-			case PRODUCT_ULTIMATE_N:
+			case NL_PRODUCT_ULTIMATE_N:
 				OSString += " Ultimate N";
 				break;
-#endif
-#ifdef PRODUCT_WEB_SERVER_CORE
-			case PRODUCT_WEB_SERVER_CORE:
+			case NL_PRODUCT_WEB_SERVER_CORE:
 				OSString += " Web Server (core installation)";
 				break;
-#endif
-#ifdef PRODUCT_MEDIUMBUSINESS_SERVER_MANAGEMENT
-			case PRODUCT_MEDIUMBUSINESS_SERVER_MANAGEMENT:
+			case NL_PRODUCT_MEDIUMBUSINESS_SERVER_MANAGEMENT:
 				OSString += " Essential Business Server Management Server";
 				break;
-#endif
-#ifdef PRODUCT_MEDIUMBUSINESS_SERVER_SECURITY
-			case PRODUCT_MEDIUMBUSINESS_SERVER_SECURITY:
+			case NL_PRODUCT_MEDIUMBUSINESS_SERVER_SECURITY:
 				OSString += " Essential Business Server Security Server";
 				break;
-#endif
-#ifdef PRODUCT_MEDIUMBUSINESS_SERVER_MESSAGING
-			case PRODUCT_MEDIUMBUSINESS_SERVER_MESSAGING:
+			case NL_PRODUCT_MEDIUMBUSINESS_SERVER_MESSAGING:
 				OSString += " Essential Business Server Messaging Server";
 				break;
-#endif
-#ifdef PRODUCT_SERVER_FOUNDATION
-			case PRODUCT_SERVER_FOUNDATION:
+			case NL_PRODUCT_SERVER_FOUNDATION:
 				OSString += " Server Foundation";
 				break;
-#endif
-#ifdef PRODUCT_HOME_PREMIUM_SERVER
-			case PRODUCT_HOME_PREMIUM_SERVER:
+			case NL_PRODUCT_HOME_PREMIUM_SERVER:
 				OSString += " Home Server";
 				break;
-#endif
-#ifdef PRODUCT_SERVER_FOR_SMALLBUSINESS_V
-			case PRODUCT_SERVER_FOR_SMALLBUSINESS_V:
+			case NL_PRODUCT_SERVER_FOR_SMALLBUSINESS_V:
 				OSString += " Server without Hyper-V for Windows Essential Server Solutions";
 				break;
-#endif
-#ifdef PRODUCT_STANDARD_SERVER_V
-			case PRODUCT_STANDARD_SERVER_V:
+			case NL_PRODUCT_STANDARD_SERVER_V:
 				OSString += " Server Standard without Hyper-V";
 				break;
-#endif
-#ifdef PRODUCT_DATACENTER_SERVER_V
-			case PRODUCT_DATACENTER_SERVER_V:
+			case NL_PRODUCT_DATACENTER_SERVER_V:
 				OSString += " Server Datacenter without Hyper-V (full installation)";
 				break;
-#endif
-#ifdef PRODUCT_ENTERPRISE_SERVER_V
-			case PRODUCT_ENTERPRISE_SERVER_V:
+			case NL_PRODUCT_ENTERPRISE_SERVER_V:
 				OSString += " Enterprise without Hyper-V (full installation)";
 				break;
-#endif
-#ifdef PRODUCT_DATACENTER_SERVER_CORE_V
-			case PRODUCT_DATACENTER_SERVER_CORE_V:
+			case NL_PRODUCT_DATACENTER_SERVER_CORE_V:
 				OSString += " Datacenter without Hyper-V (core installation)";
 				break;
-#endif
-#ifdef PRODUCT_STANDARD_SERVER_CORE_V
-			case PRODUCT_STANDARD_SERVER_CORE_V:
+			case NL_PRODUCT_STANDARD_SERVER_CORE_V:
 				OSString += " Standard without Hyper-V (core installation)";
 				break;
-#endif
-#ifdef PRODUCT_ENTERPRISE_SERVER_CORE_V
-			case PRODUCT_ENTERPRISE_SERVER_CORE_V:
+			case NL_PRODUCT_ENTERPRISE_SERVER_CORE_V:
 				OSString += " Enterprise without Hyper-V (core installation)";
 				break;
-#endif
-#ifdef PRODUCT_HYPERV
-			case PRODUCT_HYPERV:
+			case NL_PRODUCT_HYPERV:
 				OSString += " Hyper-V Server";
 				break;
-#endif
-#ifdef PRODUCT_STORAGE_EXPRESS_SERVER_CORE
-			case PRODUCT_STORAGE_EXPRESS_SERVER_CORE:
+			case NL_PRODUCT_STORAGE_EXPRESS_SERVER_CORE:
 				OSString += " Storage Server Express (core installation)";
 				break;
-#endif
-#ifdef PRODUCT_STORAGE_STANDARD_SERVER_CORE
-			case PRODUCT_STORAGE_STANDARD_SERVER_CORE:
+			case NL_PRODUCT_STORAGE_STANDARD_SERVER_CORE:
 				OSString += " Storage Server Standard (core installation)";
 				break;
-#endif
-#ifdef PRODUCT_STORAGE_WORKGROUP_SERVER_CORE
-			case PRODUCT_STORAGE_WORKGROUP_SERVER_CORE:
+			case NL_PRODUCT_STORAGE_WORKGROUP_SERVER_CORE:
 				OSString += " Storage Server Workgroup (core installation)";
 				break;
-#endif
-#ifdef PRODUCT_STORAGE_ENTERPRISE_SERVER_CORE
-			case PRODUCT_STORAGE_ENTERPRISE_SERVER_CORE:
+			case NL_PRODUCT_STORAGE_ENTERPRISE_SERVER_CORE:
 				OSString += " Storage Server Enterprise (core installation)";
 				break;
-#endif
-#ifdef PRODUCT_STARTER_N
-			case PRODUCT_STARTER_N:
+			case NL_PRODUCT_STARTER_N:
 				OSString += " Starter N Edition";
 				break;
-#endif
-#ifdef PRODUCT_PROFESSIONAL
-			case PRODUCT_PROFESSIONAL:
+			case NL_PRODUCT_PROFESSIONAL:
 				OSString += " Professional";
 				break;
-#endif
-#ifdef PRODUCT_PROFESSIONAL_N
-			case PRODUCT_PROFESSIONAL_N:
+			case NL_PRODUCT_PROFESSIONAL_N:
 				OSString += " Professional N";
 				break;
-#endif
-#ifdef PRODUCT_SB_SOLUTION_SERVER
-			case PRODUCT_SB_SOLUTION_SERVER:
+			case NL_PRODUCT_SB_SOLUTION_SERVER:
 				OSString += " Small Business Server";
 				break;
-#endif
-#ifdef PRODUCT_SERVER_FOR_SB_SOLUTIONS
-			case PRODUCT_SERVER_FOR_SB_SOLUTIONS:
+			case NL_PRODUCT_SERVER_FOR_SB_SOLUTIONS:
 				OSString += " Server For Small Business Solutions";
 				break;
-#endif
-#ifdef PRODUCT_STANDARD_SERVER_SOLUTIONS
-			case PRODUCT_STANDARD_SERVER_SOLUTIONS:
+			case NL_PRODUCT_STANDARD_SERVER_SOLUTIONS:
 				OSString += " Server Solutions Premium";
 				break;
-#endif
-#ifdef PRODUCT_STANDARD_SERVER_SOLUTIONS_CORE
-			case PRODUCT_STANDARD_SERVER_SOLUTIONS_CORE:
+			case NL_PRODUCT_STANDARD_SERVER_SOLUTIONS_CORE:
 				OSString += " Server Solutions Premium (core installation)";
 				break;
-#endif
-#ifdef PRODUCT_SB_SOLUTION_SERVER_EM
-			case PRODUCT_SB_SOLUTION_SERVER_EM:
+			case NL_PRODUCT_SB_SOLUTION_SERVER_EM:
 				OSString += " Server For Small Business Solutions EM";
 				break;
-#endif
-#ifdef PRODUCT_SERVER_FOR_SB_SOLUTIONS_EM
-			case PRODUCT_SERVER_FOR_SB_SOLUTIONS_EM:
+			case NL_PRODUCT_SERVER_FOR_SB_SOLUTIONS_EM:
 				OSString += " Server For Small Business Solutions EM";
 				break;
-#endif
-
-#ifdef PRODUCT_SOLUTION_EMBEDDEDSERVER
-			case PRODUCT_SOLUTION_EMBEDDEDSERVER:
+			case NL_PRODUCT_SOLUTION_EMBEDDEDSERVER:
 				OSString += " Solution Embedded Server (full installation)";
 				break;
-#endif
-#ifdef PRODUCT_SOLUTION_EMBEDDEDSERVER_CORE
-			case PRODUCT_SOLUTION_EMBEDDEDSERVER_CORE:
+			case NL_PRODUCT_SOLUTION_EMBEDDEDSERVER_CORE:
 				OSString += " Solution Embedded Server (core installation)";
 				break;
-#endif
-#ifdef PRODUCT_PROFESSIONAL_EMBEDDED
-			case PRODUCT_PROFESSIONAL_EMBEDDED:
+			case NL_PRODUCT_PROFESSIONAL_EMBEDDED:
 				OSString += " Professional Embedded";
 				break;
-#endif
-#ifdef PRODUCT_ESSENTIALBUSINESS_SERVER_MGMT
-			case PRODUCT_ESSENTIALBUSINESS_SERVER_MGMT:
+			case NL_PRODUCT_ESSENTIALBUSINESS_SERVER_MGMT:
 				OSString += " Essential Server Solution Management";
 				break;
-#endif
-#ifdef PRODUCT_ESSENTIALBUSINESS_SERVER_ADDL
-			case PRODUCT_ESSENTIALBUSINESS_SERVER_ADDL:
+			case NL_PRODUCT_ESSENTIALBUSINESS_SERVER_ADDL:
 				OSString += " Essential Server Solution Additional";
 				break;
-#endif
-#ifdef PRODUCT_ESSENTIALBUSINESS_SERVER_MGMTSVC
-			case PRODUCT_ESSENTIALBUSINESS_SERVER_MGMTSVC:
+			case NL_PRODUCT_ESSENTIALBUSINESS_SERVER_MGMTSVC:
 				OSString += " Essential Server Solution Management SVC";
 				break;
-#endif
-#ifdef PRODUCT_ESSENTIALBUSINESS_SERVER_ADDLSVC
-			case PRODUCT_ESSENTIALBUSINESS_SERVER_ADDLSVC:
+			case NL_PRODUCT_ESSENTIALBUSINESS_SERVER_ADDLSVC:
 				OSString += " Essential Server Solution Additional SVC";
 				break;
-#endif
-#ifdef PRODUCT_SMALLBUSINESS_SERVER_PREMIUM_CORE
-			case PRODUCT_SMALLBUSINESS_SERVER_PREMIUM_CORE:
+			case NL_PRODUCT_SMALLBUSINESS_SERVER_PREMIUM_CORE:
 				OSString += " Small Business Server Premium (core installation)";
 				break;
-#endif
-#ifdef PRODUCT_CLUSTER_SERVER_V
-			case PRODUCT_CLUSTER_SERVER_V:
+			case NL_PRODUCT_CLUSTER_SERVER_V:
 				OSString += " Server Hyper Core V";
 				break;
-#endif
-#ifdef PRODUCT_EMBEDDED
-			case PRODUCT_EMBEDDED:
+			case NL_PRODUCT_EMBEDDED:
 				OSString += " Embedded";
 				break;
-#endif
-#ifdef PRODUCT_STARTER_E
-			case PRODUCT_STARTER_E:
+			case NL_PRODUCT_STARTER_E:
 				OSString += " Starter E";
 				break;
-#endif
-#ifdef PRODUCT_HOME_BASIC_E
-			case PRODUCT_HOME_BASIC_E:
+			case NL_PRODUCT_HOME_BASIC_E:
 				OSString += " Home Basic E";
 				break;
-#endif
-#ifdef PRODUCT_HOME_PREMIUM_E
-			case PRODUCT_HOME_PREMIUM_E:
+			case NL_PRODUCT_HOME_PREMIUM_E:
 				OSString += " Home Premium E";
 				break;
-#endif
-#ifdef PRODUCT_PROFESSIONAL_E
-			case PRODUCT_PROFESSIONAL_E:
+			case NL_PRODUCT_PROFESSIONAL_E:
 				OSString += " Professional E";
 				break;
-#endif
-#ifdef PRODUCT_ENTERPRISE_E
-			case PRODUCT_ENTERPRISE_E:
+			case NL_PRODUCT_ENTERPRISE_E:
 				OSString += " Enterprise E";
 				break;
-#endif
-#ifdef PRODUCT_ULTIMATE_E
-			case PRODUCT_ULTIMATE_E:
+			case NL_PRODUCT_ULTIMATE_E:
 				OSString += " Ultimate E";
 				break;
-#endif
-#ifdef PRODUCT_ENTERPRISE_EVALUATION
-			case PRODUCT_ENTERPRISE_EVALUATION:
+			case NL_PRODUCT_ENTERPRISE_EVALUATION:
 				OSString += " Enterprise Evaluation";
 				break;
-#endif
-#ifdef PRODUCT_MULTIPOINT_STANDARD_SERVER
-			case PRODUCT_MULTIPOINT_STANDARD_SERVER:
+			// nothing from 0x49 to 0x4b
+			case NL_PRODUCT_MULTIPOINT_STANDARD_SERVER:
 				OSString += " MultiPoint Server Standard (full installation)";
 				break;
-#endif
-#ifdef PRODUCT_MULTIPOINT_PREMIUM_SERVER
-			case PRODUCT_MULTIPOINT_PREMIUM_SERVER:
+			case NL_PRODUCT_MULTIPOINT_PREMIUM_SERVER:
 				OSString += " MultiPoint Server Premium (full installation)";
 				break;
-#endif
-#ifdef PRODUCT_STANDARD_EVALUATION_SERVER
-			case PRODUCT_STANDARD_EVALUATION_SERVER:
+			case NL_PRODUCT_STANDARD_EVALUATION_SERVER:
 				OSString += " Server Standard (evaluation installation)";
 				break;
-#endif
-#ifdef PRODUCT_DATACENTER_EVALUATION_SERVER
-			case PRODUCT_DATACENTER_EVALUATION_SERVER:
+			case NL_PRODUCT_DATACENTER_EVALUATION_SERVER:
 				OSString += " Server Datacenter (evaluation installation)";
 				break;
-#endif
-#ifdef PRODUCT_ENTERPRISE_N_EVALUATION
-			case PRODUCT_ENTERPRISE_N_EVALUATION:
+			// nothing from 0x51 to 0x53
+			case NL_PRODUCT_ENTERPRISE_N_EVALUATION:
 				OSString += " Enterprise N (evaluation installation)";
 				break;
-#endif
-#ifdef PRODUCT_EMBEDDED_AUTOMOTIVE
-			case PRODUCT_EMBEDDED_AUTOMOTIVE:
+			case NL_PRODUCT_EMBEDDED_AUTOMOTIVE:
 				OSString += " Embedded Automotive";
 				break;
-#endif
-#ifdef PRODUCT_EMBEDDED_INDUSTRY_A
-			case PRODUCT_EMBEDDED_INDUSTRY_A:
+			case NL_PRODUCT_EMBEDDED_INDUSTRY_A:
 				OSString += " Embedded Industry A";
 				break;
-#endif
-#ifdef PRODUCT_THINPC
-			case PRODUCT_THINPC:
+			case NL_PRODUCT_THINPC:
 				OSString += " Thin PC";
 				break;
-#endif
-#ifdef PRODUCT_EMBEDDED_A
-			case PRODUCT_EMBEDDED_A:
+			case NL_PRODUCT_EMBEDDED_A:
 				OSString += " Embedded A";
 				break;
-#endif
-#ifdef PRODUCT_EMBEDDED_INDUSTRY
-			case PRODUCT_EMBEDDED_INDUSTRY:
+			case NL_PRODUCT_EMBEDDED_INDUSTRY:
 				OSString += " Embedded Industry";
 				break;
-#endif
-#ifdef PRODUCT_EMBEDDED_E
-			case PRODUCT_EMBEDDED_E:
+			case NL_PRODUCT_EMBEDDED_E:
 				OSString += " Embedded E";
 				break;
-#endif
-#ifdef PRODUCT_EMBEDDED_INDUSTRY_E
-			case PRODUCT_EMBEDDED_INDUSTRY_E:
+			case NL_PRODUCT_EMBEDDED_INDUSTRY_E:
 				OSString += " Embedded Industry E";
 				break;
-#endif
-#ifdef PRODUCT_EMBEDDED_INDUSTRY_A_E
-			case PRODUCT_EMBEDDED_INDUSTRY_A_E:
+			case NL_PRODUCT_EMBEDDED_INDUSTRY_A_E:
 				OSString += " Embedded Industry A E";
 				break;
-#endif
-#ifdef PRODUCT_STORAGE_WORKGROUP_EVALUATION_SERVER
-			case PRODUCT_STORAGE_WORKGROUP_EVALUATION_SERVER:
+			// nothing from 0x5d to 0x5e
+			case NL_PRODUCT_STORAGE_WORKGROUP_EVALUATION_SERVER:
 				OSString += " Storage Server Workgroup (evaluation installation)";
 				break;
-#endif
-#ifdef PRODUCT_STORAGE_STANDARD_EVALUATION_SERVER
-			case PRODUCT_STORAGE_STANDARD_EVALUATION_SERVER:
+			case NL_PRODUCT_STORAGE_STANDARD_EVALUATION_SERVER:
 				OSString += " Storage Server Standard (evaluation installation)";
 				break;
-#endif
-#ifdef PRODUCT_CORE_ARM
-			case PRODUCT_CORE_ARM:
+			case NL_PRODUCT_CORE_ARM:
 				OSString += " RT";
 				break;
-#endif
-#ifdef PRODUCT_CORE_N
-			case PRODUCT_CORE_N:
+			case NL_PRODUCT_CORE_N:
 				OSString += " Home N";
 				break;
-#endif
-#ifdef PRODUCT_CORE_COUNTRYSPECIFIC
-			case PRODUCT_CORE_COUNTRYSPECIFIC:
+			case NL_PRODUCT_CORE_COUNTRYSPECIFIC:
 				OSString += " Home China";
 				break;
-#endif
-#ifdef PRODUCT_CORE_SINGLELANGUAGE
-			case PRODUCT_CORE_SINGLELANGUAGE:
+			case NL_PRODUCT_CORE_SINGLELANGUAGE:
 				OSString += " Home Single Language";
 				break;
-#endif
-#ifdef PRODUCT_CORE
-			case PRODUCT_CORE:
+			case NL_PRODUCT_CORE:
 				OSString += " Home";
 				break;
-#endif
-#ifdef PRODUCT_PROFESSIONAL_WMC
-			case PRODUCT_PROFESSIONAL_WMC:
+			// nothing at 0x66
+			case NL_PRODUCT_PROFESSIONAL_WMC:
 				OSString += " Professional with Media Center";
 				break;
-#endif
-#ifdef PRODUCT_MOBILE_CORE
-			case PRODUCT_MOBILE_CORE:
+			case NL_PRODUCT_MOBILE_CORE:
 				OSString += " Mobile";
 				break;
-#endif
-#ifdef PRODUCT_EMBEDDED_INDUSTRY_EVAL
-			case PRODUCT_EMBEDDED_INDUSTRY_EVAL:
+			case NL_PRODUCT_EMBEDDED_INDUSTRY_EVAL:
 				OSString += " Embedded Industry (evaluation installation)";
 				break;
-#endif
-#ifdef PRODUCT_EMBEDDED_INDUSTRY_E_EVAL
-			case PRODUCT_EMBEDDED_INDUSTRY_E_EVAL:
+			case NL_PRODUCT_EMBEDDED_INDUSTRY_E_EVAL:
 				OSString += " Embedded Industry E (evaluation installation)";
 				break;
-#endif
-#ifdef PRODUCT_EMBEDDED_EVAL
-			case PRODUCT_EMBEDDED_EVAL:
+			case NL_PRODUCT_EMBEDDED_EVAL:
 				OSString += " Embedded (evaluation installation)";
 				break;
-#endif
-#ifdef PRODUCT_EMBEDDED_E_EVAL
-			case PRODUCT_EMBEDDED_E_EVAL:
+			case NL_PRODUCT_EMBEDDED_E_EVAL:
 				OSString += " Embedded E (evaluation installation)";
 				break;
-#endif
-#ifdef PRODUCT_CORE_SERVER
-			case PRODUCT_CORE_SERVER:
+			case NL_PRODUCT_CORE_SERVER:
 				OSString += " Server";
 				break;
-#endif
-#ifdef PRODUCT_CLOUD_STORAGE_SERVER
-			case PRODUCT_CLOUD_STORAGE_SERVER:
+			case NL_PRODUCT_CLOUD_STORAGE_SERVER:
 				OSString += " Server Could Storage";
 				break;
-#endif
-#ifdef PRODUCT_CORE_CONNECTED
-			case PRODUCT_CORE_CONNECTED:
+			case NL_PRODUCT_CORE_CONNECTED:
 				OSString += " Home Connected";
 				break;
-#endif
-#ifdef PRODUCT_PROFESSIONAL_STUDENT
-			case PRODUCT_PROFESSIONAL_STUDENT:
+			case NL_PRODUCT_PROFESSIONAL_STUDENT:
 				OSString += " Professional Student";
 				break;
-#endif
-#ifdef PRODUCT_CORE_CONNECTED_N
-			case PRODUCT_CORE_CONNECTED_N:
+			case NL_PRODUCT_CORE_CONNECTED_N:
 				OSString += " Home N Connected";
 				break;
-#endif
-#ifdef PRODUCT_PROFESSIONAL_STUDENT_N
-			case PRODUCT_PROFESSIONAL_STUDENT_N:
+			case NL_PRODUCT_PROFESSIONAL_STUDENT_N:
 				OSString += " Professional Student N";
 				break;
-#endif
-#ifdef PRODUCT_CORE_CONNECTED_SINGLELANGUAGE
-			case PRODUCT_CORE_CONNECTED_SINGLELANGUAGE:
+			case NL_PRODUCT_CORE_CONNECTED_SINGLELANGUAGE:
 				OSString += " Home Single Language Connected";
 				break;
-#endif
-#ifdef PRODUCT_CORE_CONNECTED_COUNTRYSPECIFIC
-			case PRODUCT_CORE_CONNECTED_COUNTRYSPECIFIC:
+			case NL_PRODUCT_CORE_CONNECTED_COUNTRYSPECIFIC:
 				OSString += " Home China Connected";
 				break;
-#endif
+			case NL_PRODUCT_CONNECTED_CAR:
+				OSString += " Connected Car";
+				break;
+			case NL_PRODUCT_INDUSTRY_HANDHELD:
+				OSString += " Industry Handheld";
+				break;
+			case NL_PRODUCT_PPI_PRO:
+				OSString += " PPI Pro";
+				break;
+			case NL_PRODUCT_ARM64_SERVER:
+				OSString += " ARM64 Server";
+				break;
+			case NL_PRODUCT_EDUCATION:
+				OSString += " Education";
+				break;
+			case NL_PRODUCT_EDUCATION_N:
+				OSString += " Education N";
+				break;
+			case NL_PRODUCT_IOTUAP:
+				OSString += " IoT Core";
+				break;
+			case NL_PRODUCT_CLOUD_HOST_INFRASTRUCTURE_SERVER:
+				OSString += " Cloud Host Infrastructure Server";
+				break;
+			case NL_PRODUCT_ENTERPRISE_S:
+				OSString += " Product Enterprise S";
+				break;
+			case NL_PRODUCT_ENTERPRISE_S_N:
+				OSString += " Enterprise S N";
+				break;
+			case NL_PRODUCT_PROFESSIONAL_S:
+				OSString += " Professional S";
+				break;
+			case NL_PRODUCT_PROFESSIONAL_S_N:
+				OSString += " Professional S N";
+				break;
+			case NL_PRODUCT_ENTERPRISE_S_EVALUATION:
+				OSString += " Enterprise S Evaluation";
+				break;
+			case NL_PRODUCT_ENTERPRISE_S_N_EVALUATION:
+				OSString += " Enterprise S N Evaluation";
+				break;
+			// nothing from x83 to 0x86
+			case NL_PRODUCT_HOLOGRAPHIC:
+				OSString += " Holographic";
+				break;
+			// nothing from x88 to 0x89
+			case NL_PRODUCT_PRO_SINGLE_LANGUAGE:
+				OSString += " Pro Single Language";
+				break;
+			case NL_PRODUCT_PRO_CHINA:
+				OSString += " Pro China";
+				break;
+			case NL_PRODUCT_ENTERPRISE_SUBSCRIPTION:
+				OSString += " Enterprise Subscription";
+				break;
+			case NL_PRODUCT_ENTERPRISE_SUBSCRIPTION_N:
+				OSString += " Enterprise Subscription N";
+				break;
+			// nothing at 0x8e
+			case NL_PRODUCT_DATACENTER_NANO_SERVER:
+				OSString += " Datacenter Nano Server";
+				break;
+			case NL_PRODUCT_STANDARD_NANO_SERVER:
+				OSString += " Standard Nano Server";
+				break;
+			case NL_PRODUCT_DATACENTER_A_SERVER_CORE:
+				OSString += " Datacenter A Server Core";
+				break;
+			case NL_PRODUCT_STANDARD_A_SERVER_CORE:
+				OSString += " Standard A Server Core";
+				break;
+			case NL_PRODUCT_DATACENTER_WS_SERVER_CORE:
+				OSString += " Datacenter WS Server Core";
+				break;
+			case NL_PRODUCT_STANDARD_WS_SERVER_CORE:
+				OSString += " Standard WS Server Core";
+				break;
+			case NL_PRODUCT_UTILITY_VM:
+				OSString += " Utility VM";
+				break;
+			// nothing from 0x96 to 0x9e
+			case NL_PRODUCT_DATACENTER_EVALUATION_SERVER_CORE:
+				OSString += " Datacenter_evaluation_server_core";
+				break;
+			case NL_PRODUCT_STANDARD_EVALUATION_SERVER_CORE:
+				OSString += " Standard Evaluation Server Core";
+				break;
+			case NL_PRODUCT_PRO_WORKSTATION:
+				OSString += " Pro Workstation";
+				break;
+			case NL_PRODUCT_PRO_WORKSTATION_N:
+				OSString += " Pro Workstation N";
+				break;
+			// nothing at 0xa3
+			case NL_PRODUCT_PRO_FOR_EDUCATION:
+				OSString += " Pro for Education";
+				break;
+			case NL_PRODUCT_PRO_FOR_EDUCATION_N:
+				OSString += " Pro for Education N";
+				break;
+			// nothing from 0xa6 to 0xa7
+			case NL_PRODUCT_AZURE_SERVER_CORE:
+				OSString += " Azure Server Core";
+				break;
+			case NL_PRODUCT_AZURE_NANO_SERVER:
+				OSString += " Azure Nano Server";
+				break;
+			// nothing at 0xaa
+			case NL_PRODUCT_ENTERPRISEG:
+				OSString += " Enterprise G";
+				break;
+			case NL_PRODUCT_ENTERPRISEGN:
+				OSString += " Enterprise GN";
+				break;
+			// nothing from 0xad to 0xae
+			case NL_PRODUCT_SERVERRDSH:
+				OSString += " Server RDSH";
+				break;
+			// nothing from 0xb0 to 0xb1
+			case NL_PRODUCT_CLOUD:
+				OSString += " Cloud";
+				break;
+			case NL_PRODUCT_CLOUDN:
+				OSString += " Cloud N";
+				break;
+
 			default:
 				OSString += toString(" Unknown Edition (0x%04x)", dwType);
 			}
diff --git a/code/nel/src/misc/win_displayer.cpp b/code/nel/src/misc/win_displayer.cpp
index b157448ec..d350f25f3 100644
--- a/code/nel/src/misc/win_displayer.cpp
+++ b/code/nel/src/misc/win_displayer.cpp
@@ -502,7 +502,7 @@ void CWinDisplayer::clear ()
 	SendMessageW (_HEdit, EM_SETSEL, 0, nIndex);
 
 	// clear all the text
-	SendMessageW (_HEdit, EM_REPLACESEL, FALSE, (LPARAM) "");
+	SendMessageW (_HEdit, EM_REPLACESEL, FALSE, (LPARAM) L"");
 
 	SendMessageW(_HEdit,EM_SETMODIFY,(WPARAM)TRUE,(LPARAM)0);
 
@@ -575,7 +575,7 @@ void CWinDisplayer::display_main ()
 						LRESULT oldIndex2 = SendMessageW (_HEdit, EM_LINEINDEX, nblineremove, 0);
 						//nlassert (oldIndex2 != -1);
 						SendMessageW (_HEdit, EM_SETSEL, oldIndex1, oldIndex2);
-						SendMessageW (_HEdit, EM_REPLACESEL, FALSE, (LPARAM) "");
+						SendMessageW (_HEdit, EM_REPLACESEL, FALSE, (LPARAM) L"");
 
 						// update the selection due to the erasing
 						sint dt = (sint)(oldIndex2 - oldIndex1);
diff --git a/code/nel/src/net/buf_client.cpp b/code/nel/src/net/buf_client.cpp
index 350b2d6db..18ce7babf 100644
--- a/code/nel/src/net/buf_client.cpp
+++ b/code/nel/src/net/buf_client.cpp
@@ -32,6 +32,10 @@
 #	include <netinet/in.h>
 #endif
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace NLMISC;
 using namespace std;
 
diff --git a/code/nel/src/net/inet_address.cpp b/code/nel/src/net/inet_address.cpp
index 093bf8dcb..13ae02c39 100644
--- a/code/nel/src/net/inet_address.cpp
+++ b/code/nel/src/net/inet_address.cpp
@@ -121,6 +121,10 @@ BOOLEAN IN6_IS_ADDR_UNSPECIFIED(CONST IN6_ADDR *a)
 using namespace std;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 #ifndef NI_MAXHOST
 #	define NI_MAXHOST 1025
 #endif
diff --git a/code/nel/src/net/module.cpp b/code/nel/src/net/module.cpp
index 73a1c7867..1b5e03bec 100644
--- a/code/nel/src/net/module.cpp
+++ b/code/nel/src/net/module.cpp
@@ -24,6 +24,10 @@
 #include "nel/net/module_gateway.h"
 #include "nel/net/module_socket.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 using namespace NLNET;
diff --git a/code/nel/src/net/stdnet.h b/code/nel/src/net/stdnet.h
index 16e87c9f8..6ced991a5 100644
--- a/code/nel/src/net/stdnet.h
+++ b/code/nel/src/net/stdnet.h
@@ -17,20 +17,11 @@
 #ifndef NL_STDNET_H
 #define NL_STDNET_H
 
-#include "nel/misc/types_nl.h"
-
-#ifdef NL_OS_WINDOWS
-#	define WIN32_LEAN_AND_MEAN
-#	define _WIN32_WINDOWS 0x0500
-#	ifndef _WIN32_WINNT
-#		define _WIN32_WINNT 0x0500
-#	endif
-#	ifndef NL_COMP_MINGW
-#		define WINVER 0x0500
-#		define NOMINMAX
-#	endif
-#	include <WinSock2.h>
-#	include <Windows.h>
+#if defined(_MSC_VER) && defined(_DEBUG)
+#define _CRTDBG_MAP_ALLOC
+#include <stdlib.h>
+#include <crtdbg.h>
+#define DEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
 #endif
 
 #include <map>
@@ -55,6 +46,7 @@
 
 #include <errno.h>
 
+#include "nel/misc/types_nl.h"
 #include "nel/misc/debug.h"
 #include "nel/misc/common.h"
 #include "nel/misc/stream.h"
@@ -64,4 +56,18 @@
 #include "nel/misc/mem_stream.h"
 #include "nel/misc/hierarchical_timer.h"
 
+#ifdef NL_OS_WINDOWS
+#	define WIN32_LEAN_AND_MEAN
+#	define _WIN32_WINDOWS 0x0500
+#	ifndef _WIN32_WINNT
+#		define _WIN32_WINNT 0x0500
+#	endif
+#	ifndef NL_COMP_MINGW
+#		define WINVER 0x0500
+#		define NOMINMAX
+#	endif
+#	include <WinSock2.h>
+#	include <Windows.h>
+#endif
+
 #endif
diff --git a/code/nel/src/net/transport_class.cpp b/code/nel/src/net/transport_class.cpp
index 810ea6928..9dade0190 100644
--- a/code/nel/src/net/transport_class.cpp
+++ b/code/nel/src/net/transport_class.cpp
@@ -33,6 +33,9 @@
 
 #include "nel/net/transport_class.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 //
 // Namespace
diff --git a/code/nel/src/net/unified_network.cpp b/code/nel/src/net/unified_network.cpp
index 3a57b4b0d..2589e1cbf 100644
--- a/code/nel/src/net/unified_network.cpp
+++ b/code/nel/src/net/unified_network.cpp
@@ -828,7 +828,6 @@ void	CUnifiedNetwork::addService(const string &name, const vector<CInetAddress>
 	for (uint i = 0; i < addr.size(); i++)
 	{
 		// first we have to look if we have a network that can established the connection
-
 		uint j = 0;
 
 		// it's loopback ip address, it's ok
diff --git a/code/nel/src/pacs/surface_quad.cpp b/code/nel/src/pacs/surface_quad.cpp
index dade8462c..308dc0054 100644
--- a/code/nel/src/pacs/surface_quad.cpp
+++ b/code/nel/src/pacs/surface_quad.cpp
@@ -19,6 +19,10 @@
 
 #include "nel/misc/file.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace NLMISC;
 using namespace std;
 
diff --git a/code/nel/src/sound/audio_mixer_user.cpp b/code/nel/src/sound/audio_mixer_user.cpp
index 5a21650e0..854a2c1dc 100644
--- a/code/nel/src/sound/audio_mixer_user.cpp
+++ b/code/nel/src/sound/audio_mixer_user.cpp
@@ -56,6 +56,10 @@
 #include "nel/sound/containers.h"
 #include "nel/sound/audio_decoder.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 
diff --git a/code/nel/src/sound/sound_bank.cpp b/code/nel/src/sound/sound_bank.cpp
index ee00e1742..29621d337 100644
--- a/code/nel/src/sound/sound_bank.cpp
+++ b/code/nel/src/sound/sound_bank.cpp
@@ -33,6 +33,10 @@
 
 #include "nel/georges/load_form.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 using namespace NLGEORGES;
diff --git a/code/nel/src/sound/stdsound.h b/code/nel/src/sound/stdsound.h
index 071e2c70c..474e64441 100644
--- a/code/nel/src/sound/stdsound.h
+++ b/code/nel/src/sound/stdsound.h
@@ -14,9 +14,15 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "nel/misc/types_nl.h"
-#include "nel/misc/common.h"
-#include "nel/misc/debug.h"
+#ifndef SOUND_STDPCH_H
+#define SOUND_STDPCH_H
+
+#if defined(_MSC_VER) && defined(_DEBUG)
+#define _CRTDBG_MAP_ALLOC
+#include <stdlib.h>
+#include <crtdbg.h>
+#define DEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
+#endif
 
 #include <cstdlib>
 #include <cstdio>
@@ -40,6 +46,11 @@
 
 #include <libxml/parser.h>
 
+#include "nel/misc/types_nl.h"
+#include "nel/misc/common.h"
+#include "nel/misc/debug.h"
 #include "nel/misc/vector.h"
 #include "nel/misc/path.h"
 #include "nel/misc/file.h"
+
+#endif
diff --git a/code/nel/tools/3d/mesh_utils/CMakeLists.txt b/code/nel/tools/3d/mesh_utils/CMakeLists.txt
index 0d9f6deb3..d8a5b29d9 100644
--- a/code/nel/tools/3d/mesh_utils/CMakeLists.txt
+++ b/code/nel/tools/3d/mesh_utils/CMakeLists.txt
@@ -3,11 +3,11 @@ FILE(GLOB HDRS *.h)
 
 SOURCE_GROUP("" FILES ${SRCS} ${HDRS})
 
-INCLUDE_DIRECTORIES(${assimp_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${ASSIMP_INCLUDE_DIRS})
 
 NL_TARGET_LIB(mesh_utils ${SRCS} ${HDRS})
 
-TARGET_LINK_LIBRARIES(mesh_utils ${assimp_LIBRARIES} nelmisc nelpipeline nel3d)
+TARGET_LINK_LIBRARIES(mesh_utils ${ASSIMP_LIBRARIES} nelmisc nelpipeline nel3d)
 NL_DEFAULT_PROPS(mesh_utils "NeL, Tools, 3D: Mesh Utils")
 NL_ADD_RUNTIME_FLAGS(mesh_utils)
 
diff --git a/code/nel/tools/3d/object_viewer/dup_ps.cpp b/code/nel/tools/3d/object_viewer/dup_ps.cpp
index d942a3d6e..1d9f538c4 100644
--- a/code/nel/tools/3d/object_viewer/dup_ps.cpp
+++ b/code/nel/tools/3d/object_viewer/dup_ps.cpp
@@ -40,7 +40,7 @@ using namespace NL3D;
   * TODO maybe this could be used elsewhere ?    
   */
 template <class TSerializePolicy, typename T>
-static T	*DupSerializable(const T *in) throw(NLMISC::EStream)
+static T	*DupSerializable(const T *in)
 {
 	NLMISC::CMemStream ms;	
 	nlassert(!ms.isReading());
@@ -62,7 +62,7 @@ static T	*DupSerializable(const T *in) throw(NLMISC::EStream)
 struct CDupObjPolicy
 {
 	template <typename T>
-	static void serial(T *&obj, NLMISC::IStream &dest)  throw(NLMISC::EStream)
+	static void serial(T *&obj, NLMISC::IStream &dest)
 	{ 	
 		dest.serialPtr(obj);
 		/*if (dest.isReading())
@@ -84,7 +84,7 @@ struct CDupObjPolicy
 struct CDupPolymorphicObjPolicy
 {
 	template <typename T>
-	static void serial(T *&obj, NLMISC::IStream &dest)  throw(NLMISC::EStream)
+	static void serial(T *&obj, NLMISC::IStream &dest)
 	{ 	
 		dest.serialPolyPtr(obj);		
 	}
diff --git a/code/nel/tools/3d/object_viewer/object_viewer.cpp b/code/nel/tools/3d/object_viewer/object_viewer.cpp
index 2835b9b42..f1f663e38 100644
--- a/code/nel/tools/3d/object_viewer/object_viewer.cpp
+++ b/code/nel/tools/3d/object_viewer/object_viewer.cpp
@@ -3897,7 +3897,7 @@ bool browseFolder(const CString &caption, CString &destFolder, HWND parent)
 	bi.lpfn = NULL;
 	bi.lParam = NULL;
 	bi.iImage = 0;
-	LPITEMIDLIST result = SHBrowseForFolder(&bi);
+	PIDLIST_ABSOLUTE result = SHBrowseForFolder(&bi);
 	if (result != NULL && SHGetPathFromIDList(result, chosenPath))
 	{
 		destFolder = chosenPath;
diff --git a/code/nel/tools/3d/object_viewer/particle_workspace.cpp b/code/nel/tools/3d/object_viewer/particle_workspace.cpp
index 54df32400..43be30812 100644
--- a/code/nel/tools/3d/object_viewer/particle_workspace.cpp
+++ b/code/nel/tools/3d/object_viewer/particle_workspace.cpp
@@ -260,7 +260,7 @@ void CParticleWorkspace::CNode::savePS()
 
 
 //***********************************************************************************************
-void CParticleWorkspace::CNode::savePSAs(const std::string &fullPath) throw(NLMISC::EStream)
+void CParticleWorkspace::CNode::savePSAs(const std::string &fullPath)
 {
 	nlassert(_WS);
 	if (!_PS) return;	
@@ -415,7 +415,7 @@ void CParticleWorkspace::removeNode(CNode *ptr)
 }
 
 //***********************************************************************************************
-void CParticleWorkspace::save() throw(NLMISC::EStream)
+void CParticleWorkspace::save()
 {
 	NLMISC::COFile stream;
 	stream.open(_Filename);
@@ -437,7 +437,7 @@ void CParticleWorkspace::load()
 }
 
 //***********************************************************************************************
-void CParticleWorkspace::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CParticleWorkspace::serial(NLMISC::IStream &f)
 {
 	f.xmlPush("PARTICLE_WORKSPACE");
 	f.serialVersion(0);
diff --git a/code/nel/tools/3d/object_viewer/particle_workspace.h b/code/nel/tools/3d/object_viewer/particle_workspace.h
index fb94b2e15..694aab986 100644
--- a/code/nel/tools/3d/object_viewer/particle_workspace.h
+++ b/code/nel/tools/3d/object_viewer/particle_workspace.h
@@ -60,15 +60,15 @@ public:
 		// Serial node information into workspace stream. This does not save the particle system shape, only a reference to its file
 		void					   serial(NLMISC::IStream &f);
 		// Save the particle system target file
-		void					   savePS() throw(NLMISC::EStream);
+		void					   savePS();
 		// Save particle system with an arbitrary filename
-		void					   savePSAs(const std::string &fullPath) throw(NLMISC::EStream);
+		void					   savePSAs(const std::string &fullPath);
 		// put back in the unloaded state
 		void					   unload();
 		/** Load the particle system target file
 		  * \return true if loading succeed (false means that loading was ok, but this is not a particle system). Other cases throw an exception.
 		  */
-		bool					   loadPS() throw(NLMISC::EStream);
+		bool					   loadPS();
 		// create an empty particle system
 		void					   createEmptyPS();
 		// helper flag to know if a ps has been modified
@@ -196,11 +196,11 @@ public:
 	/** Save the workspace structure. The target file is the one given when this object was created	  
 	  * NB : ps shape are not saved, only the structure is. To save the shapes, call CNode::save()
 	  */
-	void		save() throw(NLMISC::EStream);
+	void		save();
 	/** Load the workspace structure. The target file is the one given when this object was created
 	  * All nodes are in the 'unloaded" state, so it is to the caller to load them by calling load() on their node
 	  */
-	void		load() throw(NLMISC::EStream);
+	void		load();
 	// Test whether the structure of the workspace has been modified (does not test if ps inside the workspace have been modified)
 	bool		isModified() const { return _Modified; }
 	// Test whether the content of the workspace has ben modified
@@ -229,7 +229,7 @@ private:
 	std::string						_Name;		// workspace user name
 private:
 	// serial the object
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);	
+	void serial(NLMISC::IStream &f);	
 	// set the 'modified flag' and call the callback
 	void setModifiedFlag(bool modified);
 public:		
diff --git a/code/nel/tools/3d/object_viewer/range_manager.h b/code/nel/tools/3d/object_viewer/range_manager.h
index 2bdac5189..338578ce4 100644
--- a/code/nel/tools/3d/object_viewer/range_manager.h
+++ b/code/nel/tools/3d/object_viewer/range_manager.h
@@ -62,7 +62,7 @@ public:
 	}
 
 	/// serialization
-	static void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	static void serial(NLMISC::IStream &f)
 	{
 		uint32 size;		
 		if (!f.isReading())
diff --git a/code/nel/tools/3d/object_viewer/scheme_manager.cpp b/code/nel/tools/3d/object_viewer/scheme_manager.cpp
index e7f93b589..7c3d7a3ec 100644
--- a/code/nel/tools/3d/object_viewer/scheme_manager.cpp
+++ b/code/nel/tools/3d/object_viewer/scheme_manager.cpp
@@ -47,7 +47,7 @@ void CSchemeManager::getSchemes(const std::string &type, std::vector<TSchemeInfo
 	}
 }
 
-void CSchemeManager::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CSchemeManager::serial(NLMISC::IStream &f)
 {
 	
 	f.serialCheck((uint32) '_GNM');
diff --git a/code/nel/tools/3d/object_viewer/scheme_manager.h b/code/nel/tools/3d/object_viewer/scheme_manager.h
index e47c4b940..3c9cfcf0d 100644
--- a/code/nel/tools/3d/object_viewer/scheme_manager.h
+++ b/code/nel/tools/3d/object_viewer/scheme_manager.h
@@ -40,7 +40,7 @@ public:
 	// get all the schemes with the given type
 	void getSchemes(const std::string &type, std::vector<TSchemeInfo> &dest);
 	// serial this collection
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 	// swap this collection with another one
 	void	swap(CSchemeManager &other);
 	// remove a scheme from the bank, given a pointer on it
diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export.cpp b/code/nel/tools/3d/plugin_max/nel_export/nel_export.cpp
index f0de21376..4482ab51f 100644
--- a/code/nel/tools/3d/plugin_max/nel_export/nel_export.cpp
+++ b/code/nel/tools/3d/plugin_max/nel_export/nel_export.cpp
@@ -243,7 +243,7 @@ extern HINSTANCE hInstance;
 static INT_PTR CALLBACK CNelExportDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	// Set locale to english
-	setlocale (LC_NUMERIC, "English");
+	setlocale (LC_NUMERIC, "C");
 
 	BOOL ret = TRUE;
 	switch (msg)
@@ -744,11 +744,6 @@ static INT_PTR CALLBACK CNelExportDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LP
 			}
 
 			break;
-		case WM_LBUTTONDOWN:
-		case WM_LBUTTONUP:
-		case WM_MOUSEMOVE:
-			theCNelExport._Ip->RollupMouseMessage(hWnd,msg,wParam,lParam);
-			break;
 
 		default:
 			ret = FALSE;
diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export.h b/code/nel/tools/3d/plugin_max/nel_export/nel_export.h
index eabc05a09..3cf20cf47 100644
--- a/code/nel/tools/3d/plugin_max/nel_export/nel_export.h
+++ b/code/nel/tools/3d/plugin_max/nel_export/nel_export.h
@@ -49,7 +49,7 @@ public:
 
 	CNelExport ();
 
-	~CNelExport();
+	virtual ~CNelExport();
 
 	void init (bool view, bool errorInDialog, Interface	*ip, bool loadStruct);
 
@@ -81,8 +81,8 @@ public:
 	static void deleteLM(INode& ZeNode); // the export scene struct MUST be initialized before calling this fn
 	void			OnNodeProperties (const std::set<INode*> &listNode);
 
-	ULONG SelectFileForSave(HWND Parent, TCHAR* Title, const TCHAR* Mask, std::string &FileName);
-	ULONG SelectDir(HWND Parent, TCHAR* Title, std::string &Path);
+	ULONG SelectFileForSave(HWND Parent, const TCHAR* Title, const TCHAR* Mask, std::string &FileName);
+	ULONG SelectDir(HWND Parent, const TCHAR* Title, std::string &Path);
 
 	// The nel export objtect
 	CExportNel		*_ExportNel;
diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export_export.cpp b/code/nel/tools/3d/plugin_max/nel_export/nel_export_export.cpp
index a41c3134c..3be72a9bb 100644
--- a/code/nel/tools/3d/plugin_max/nel_export/nel_export_export.cpp
+++ b/code/nel/tools/3d/plugin_max/nel_export/nel_export_export.cpp
@@ -265,7 +265,7 @@ bool CNelExport::exportAnim (const std::string &sPath, std::vector<INode*>& vect
 			{
 				// try to get the prefix from the appData if present. If not, takes it from the node name
 				nodeName = CExportNel::getScriptAppData (vectNode[n], NEL3D_APPDATA_INSTANCE_NAME, "");
-				if (nodeName == "") // not found ?
+				if (nodeName.empty()) // not found ?
 				{
 					nodeName=CExportNel::getName (*vectNode[n]);
 				}
diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export_filetools.cpp b/code/nel/tools/3d/plugin_max/nel_export/nel_export_filetools.cpp
index 7ecb61efe..11020e4fc 100644
--- a/code/nel/tools/3d/plugin_max/nel_export/nel_export_filetools.cpp
+++ b/code/nel/tools/3d/plugin_max/nel_export/nel_export_filetools.cpp
@@ -26,7 +26,7 @@
 
 //--------------------------------------------------------------------------------------------------------------
 
-ULONG CNelExport::SelectFileForSave(HWND Parent, TCHAR* Title, const TCHAR* Mask, std::string &FileName)
+ULONG CNelExport::SelectFileForSave(HWND Parent, const TCHAR* Title, const TCHAR* Mask, std::string &FileName)
 {
 	TCHAR curdir[MAX_PATH];
 	TCHAR fname[MAX_PATH];
@@ -76,7 +76,7 @@ ULONG CNelExport::SelectFileForSave(HWND Parent, TCHAR* Title, const TCHAR* Mask
 
 //--------------------------------------------------------------------------------------------------------------
 
-ULONG CNelExport::SelectDir(HWND Parent, TCHAR* Title, std::string &Path)
+ULONG CNelExport::SelectDir(HWND Parent, const TCHAR* Title, std::string &Path)
 {
 	TCHAR str[MAX_PATH];
 	_tcscpy_s(str, MAX_PATH, utf8ToTStr(Path));
@@ -91,7 +91,7 @@ ULONG CNelExport::SelectDir(HWND Parent, TCHAR* Title, std::string &Path)
 	bi.lParam=0;
 	bi.iImage=0;
 
-	ITEMIDLIST*	pidl = SHBrowseForFolder(&bi);
+	PIDLIST_ABSOLUTE pidl = SHBrowseForFolder(&bi);
 
 	if (!SHGetPathFromIDList(pidl,str) ) 
 	{
diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export_node_properties.cpp b/code/nel/tools/3d/plugin_max/nel_export/nel_export_node_properties.cpp
index 59d149128..949395d14 100644
--- a/code/nel/tools/3d/plugin_max/nel_export/nel_export_node_properties.cpp
+++ b/code/nel/tools/3d/plugin_max/nel_export/nel_export_node_properties.cpp
@@ -63,7 +63,7 @@ TCHAR *_EnvironmentNames[] =
 	_T("PSYCHOTIC"),
 	NULL
 };
-TCHAR *_MaterialNames[] = 
+TCHAR *_MaterialNames[] =
 {
 	_T(""),
 	_T("no occlusion"),
@@ -85,7 +85,7 @@ const std::set<INode*> *listNodeCallBack;
 
 // ***************************************************************************
 
-class addSubLodNodeHitCallBack : public HitByNameDlgCallback 
+class addSubLodNodeHitCallBack : public HitByNameDlgCallback
 {
 public:
 	INodeTab	NodeTab;
@@ -154,7 +154,7 @@ public:
 		((CRGBA*)this)->operator= (col);
 		return *this;
 	}
-	
+
 	void setDifferentValuesMode()
 	{
 		DifferentValues= true;
@@ -174,7 +174,7 @@ public:
 			SubDlg[i] = NULL;
 		for (i=0; i<VP_COUNT; i++)
 			SubVPDlg[i] = NULL;
-		InterfaceThreshold = 0.1f;		
+		InterfaceThreshold = 0.1f;
 		GetInterfaceNormalsFromSceneObjects = 0;
 		LMCEnabled= 0;
 	}
@@ -224,7 +224,7 @@ public:
 	std::string				InterfaceFileName;
 	int					    GetInterfaceNormalsFromSceneObjects;
 	float					InterfaceThreshold;
-	int						DontAddToScene;	
+	int						DontAddToScene;
 	int						DontExport;
 
 	// Lighting
@@ -235,7 +235,7 @@ public:
 
 	// VertexProgram.
 	int						VertexProgramId;
-	bool					VertexProgramBypassed;	
+	bool					VertexProgramBypassed;
 	// WindTree VertexProgram.
 	CVPWindTreeAppData		VertexProgramWindTree;
 
@@ -258,8 +258,8 @@ public:
 	// Compression term for 8Bits LightMap Compression
 	CRGBAProp				LMCAmbient[NumLightGroup];
 	CRGBAProp				LMCDiffuse[NumLightGroup];
-	
-	
+
+
 	// Misc
 	int						FloatingObject;
 	int						SWT;
@@ -360,7 +360,7 @@ void LightingStateChanged (HWND hwndDlg, CLodDialogBoxParam *currentParam)
 	EnableWindow(GetDlgItem (hwndDlg, IDC_USE_LIGHT_LOCAL_ATTENUATION), currentParam->VertexProgramBypassed ? FALSE : TRUE);
 
 	// Enable AmbientAddSun for realTime Ambient only
-	EnableWindow(GetDlgItem (hwndDlg, IDC_REALTIME_LIGHT_AMBIENT_ADD_SUN), 
+	EnableWindow(GetDlgItem (hwndDlg, IDC_REALTIME_LIGHT_AMBIENT_ADD_SUN),
 		SendMessage (GetDlgItem (hwndDlg, IDC_EXPORT_REALTIME_LIGHT), BM_GETCHECK, 0, 0)!=BST_UNCHECKED);
 }
 
@@ -382,14 +382,14 @@ void VegetableStateChanged (HWND hwndDlg)
 {
 	// Vegetable ?
 	bool enable = ( SendMessage (GetDlgItem (hwndDlg, IDC_VEGETABLE), BM_GETCHECK, 0, 0)!=BST_UNCHECKED );
-	
+
 	// Enable alpha blend button
 	EnableWindow (GetDlgItem (hwndDlg, IDC_VEGETABLE_ALPHA_BLEND_ON), enable);
 	EnableWindow (GetDlgItem (hwndDlg, IDC_VEGETABLE_ALPHA_BLEND_OFF), enable);
 	EnableWindow (GetDlgItem (hwndDlg, IDC_CENTER_Z), enable);
 	EnableWindow (GetDlgItem (hwndDlg, IDC_CENTER_NULL), enable);
 	EnableWindow (GetDlgItem (hwndDlg, IDC_VEGETABLE_BEND_FACTOR), enable);
-	
+
 	// Alpha blend ?
 	bool alphaBlend = IsDlgButtonChecked (hwndDlg, IDC_VEGETABLE_ALPHA_BLEND_ON)!=BST_UNCHECKED;
 
@@ -407,7 +407,7 @@ void VegetableStateChanged (HWND hwndDlg)
 		precomputed= IsDlgButtonChecked (hwndDlg, IDC_VEGETABLE_AB_ON_LIGHTED_PRECOMPUTED)!=BST_UNCHECKED;
 	else
 		precomputed= IsDlgButtonChecked (hwndDlg, IDC_VEGETABLE_AB_OFF_LIGHTED_PRECOMPUTED)!=BST_UNCHECKED;
-	
+
 	// Force Best Sided Lighting only if precomputed
 	EnableWindow (GetDlgItem (hwndDlg, IDC_VEGETABLE_FORCE_BEST_SIDED_LIGHTING), enable && precomputed);
 
@@ -456,7 +456,7 @@ void exploreNode(INode *node)
 
 	if (soundGroup != "no sound")
 		_KnownSoundGroups.insert(soundGroup);
-	
+
 	for (int i= 0; i<node->NumChildren(); ++i)
 	{
 		exploreNode(node->GetChildNode(i));
@@ -473,7 +473,7 @@ INT_PTR CALLBACK AccelDialogCallback (
 {
 	CLodDialogBoxParam *currentParam=(CLodDialogBoxParam *)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
 
-	switch (uMsg) 
+	switch (uMsg)
 	{
 		case WM_INITDIALOG:
 		{
@@ -508,42 +508,42 @@ INT_PTR CALLBACK AccelDialogCallback (
 			{
 				for (uint i=0; _MaterialNames[i] != 0; ++i)
 				{
-					SendMessage (GetDlgItem (hwndDlg, IDC_OCC_MODEL), CB_ADDSTRING, 0, (LPARAM)(_MaterialNames[i]));
-					SendMessage (GetDlgItem (hwndDlg, IDC_OPEN_OCC_MODEL), CB_ADDSTRING, 0, (LPARAM)(_MaterialNames[i]));
+					SendMessage (GetDlgItem (hwndDlg, IDC_OCC_MODEL), CB_ADDSTRING, 0, (LPARAM)_MaterialNames[i]);
+					SendMessage (GetDlgItem (hwndDlg, IDC_OPEN_OCC_MODEL), CB_ADDSTRING, 0, (LPARAM)_MaterialNames[i]);
 				}
 			}
 			{
 				for (uint i =0; _EnvironmentNames[i] != 0; ++i)
 				{
-					SendMessage (GetDlgItem (hwndDlg, IDC_ENV_FX), CB_ADDSTRING, 0, (LPARAM)(_EnvironmentNames[i]));
+					SendMessage (GetDlgItem (hwndDlg, IDC_ENV_FX), CB_ADDSTRING, 0, (LPARAM)_EnvironmentNames[i]);
 				}
 			}
 			{
 				std::set<std::string>::iterator first(_KnownSoundGroups.begin()), last(_KnownSoundGroups.end());
 				for (; first != last; ++first)
 				{
-					SendMessage (GetDlgItem (hwndDlg, IDC_SOUND_GROUP), CB_ADDSTRING, 0, (LPARAM)(first->c_str()));
+					SendMessage (GetDlgItem (hwndDlg, IDC_SOUND_GROUP), CB_ADDSTRING, 0, (LPARAM)utf8ToTStr(*first));
 				}
 			}
 			// set the combo and edit box
-			if (SendMessage (GetDlgItem (hwndDlg, IDC_OCC_MODEL), CB_SELECTSTRING, -1, (LPARAM)(currentParam->OcclusionModel.c_str())) == CB_ERR)
+			if (SendMessage (GetDlgItem (hwndDlg, IDC_OCC_MODEL), CB_SELECTSTRING, -1, (LPARAM)utf8ToTStr(currentParam->OcclusionModel)) == CB_ERR)
 			{
 //				nlassert(false);
 			}
-			if (SendMessage (GetDlgItem (hwndDlg, IDC_OPEN_OCC_MODEL), CB_SELECTSTRING, -1, (LPARAM)(currentParam->OpenOcclusionModel.c_str())) == CB_ERR)
+			if (SendMessage (GetDlgItem (hwndDlg, IDC_OPEN_OCC_MODEL), CB_SELECTSTRING, -1, (LPARAM)utf8ToTStr(currentParam->OpenOcclusionModel)) == CB_ERR)
 			{
 //				nlassert(false);
 			}
-			if (SendMessage (GetDlgItem (hwndDlg, IDC_ENV_FX), CB_SELECTSTRING, -1, (LPARAM)(currentParam->EnvironmentFX.c_str())) == CB_ERR)
+			if (SendMessage (GetDlgItem (hwndDlg, IDC_ENV_FX), CB_SELECTSTRING, -1, (LPARAM)utf8ToTStr(currentParam->EnvironmentFX)) == CB_ERR)
 			{
 //				nlassert(false);
 			}
-			if (SendMessage (GetDlgItem (hwndDlg, IDC_SOUND_GROUP), CB_SELECTSTRING, -1, (LPARAM)(currentParam->SoundGroup.c_str())) == CB_ERR)
+			if (SendMessage (GetDlgItem (hwndDlg, IDC_SOUND_GROUP), CB_SELECTSTRING, -1, (LPARAM)utf8ToTStr(currentParam->SoundGroup)) == CB_ERR)
 			{
 //				nlassert(false);
 			}
-//			SendMessage(GetDlgItem(hwndDlg, IDC_SOUND_GROUP), WM_SETTEXT, 0, (LONG)(currentParam->SoundGroup.c_str()));
-	
+//			SendMessage(GetDlgItem(hwndDlg, IDC_SOUND_GROUP), WM_SETTEXT, 0, (LPARAM)utf8ToTStr(currentParam->SoundGroup));
+
 			bool accelerator = (currentParam->AcceleratorType != -1);
 			CheckRadioButton (hwndDlg, IDC_RADIOACCELNO, IDC_RADIOACCELCLUSTER, accelerator?(IDC_RADIOACCELNO+(currentParam->AcceleratorType&NEL3D_APPDATA_ACCEL_TYPE)):0);
 			AccelStateChanged (hwndDlg);
@@ -554,7 +554,7 @@ INT_PTR CALLBACK AccelDialogCallback (
 			if( HIWORD(wParam) == BN_CLICKED )
 			{
 				HWND hwndButton = (HWND) lParam;
-				switch (LOWORD(wParam)) 
+				switch (LOWORD(wParam))
 				{
 					case IDCANCEL:
 						EndDialog(hwndDlg, IDCANCEL);
@@ -644,7 +644,7 @@ INT_PTR CALLBACK MRMDialogCallback (
 {
 	CLodDialogBoxParam *currentParam=(CLodDialogBoxParam *)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
 
-	switch (uMsg) 
+	switch (uMsg)
 	{
 		case WM_INITDIALOG:
 		{
@@ -668,7 +668,7 @@ INT_PTR CALLBACK MRMDialogCallback (
 			EnableWindow (GetDlgItem (hwndDlg, IDC_REMOVE), currentParam->ListActived);
 			EnableWindow (GetDlgItem (hwndDlg, IDC_UP), currentParam->ListActived);
 			EnableWindow (GetDlgItem (hwndDlg, IDC_DOWN), currentParam->ListActived);
-			
+
 			SetWindowText (GetDlgItem (hwndDlg, IDC_DIST_MAX), utf8ToTStr(currentParam->DistMax));
 			SetWindowText (GetDlgItem (hwndDlg, IDC_BLEND_LENGTH), utf8ToTStr(currentParam->BlendLength));
 
@@ -704,7 +704,7 @@ INT_PTR CALLBACK MRMDialogCallback (
 			if( HIWORD(wParam) == BN_CLICKED )
 			{
 				HWND hwndButton = (HWND) lParam;
-				switch (LOWORD(wParam)) 
+				switch (LOWORD(wParam))
 				{
 					case IDCANCEL:
 						EndDialog(hwndDlg, IDCANCEL);
@@ -716,7 +716,7 @@ INT_PTR CALLBACK MRMDialogCallback (
 							currentParam->BlendOut=SendMessage (GetDlgItem (hwndDlg, IDC_BLEND_OUT), BM_GETCHECK, 0, 0);
 							currentParam->CoarseMesh=SendMessage (GetDlgItem (hwndDlg, IDC_COARSE_MESH), BM_GETCHECK, 0, 0);
 							currentParam->DynamicMesh=SendMessage (GetDlgItem (hwndDlg, IDC_DYNAMIC_MESH), BM_GETCHECK, 0, 0);
-							
+
 							TCHAR tmp[512];
 							GetWindowText (GetDlgItem (hwndDlg, IDC_DIST_MAX), tmp, 512);
 							currentParam->DistMax = tStrToUtf8(tmp);
@@ -912,7 +912,7 @@ INT_PTR CALLBACK InstanceDialogCallback (
 {
 	CLodDialogBoxParam *currentParam=(CLodDialogBoxParam *)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
 
-	switch (uMsg) 
+	switch (uMsg)
 	{
 		case WM_INITDIALOG:
 		{
@@ -934,7 +934,7 @@ INT_PTR CALLBACK InstanceDialogCallback (
 
 			bool colOk = currentParam->CollisionMeshGeneration>=0 && currentParam->CollisionMeshGeneration<4;
 			CheckRadioButton (hwndDlg, IDC_CAMERA_COL_RADIO1, IDC_CAMERA_COL_RADIO4, colOk?(IDC_CAMERA_COL_RADIO1+(currentParam->CollisionMeshGeneration)):0);
-			
+
 			InstanceStateChanged(hwndDlg);
 		}
 		break;
@@ -943,7 +943,7 @@ INT_PTR CALLBACK InstanceDialogCallback (
 			if( HIWORD(wParam) == BN_CLICKED )
 			{
 				HWND hwndButton = (HWND) lParam;
-				switch (LOWORD(wParam)) 
+				switch (LOWORD(wParam))
 				{
 					case IDCANCEL:
 						EndDialog(hwndDlg, IDCANCEL);
@@ -956,7 +956,7 @@ INT_PTR CALLBACK InstanceDialogCallback (
 
 							GetWindowText (GetDlgItem (hwndDlg, IDC_EDIT_INSTANCE_NAME), tmp, 512);
 							currentParam->InstanceName = tStrToUtf8(tmp);
-							
+
 							currentParam->DontAddToScene=SendMessage (GetDlgItem (hwndDlg, IDC_DONT_ADD_TO_SCENE), BM_GETCHECK, 0, 0);
 							GetWindowText (GetDlgItem (hwndDlg, IDC_EDIT_INSTANCE_GROUP_NAME), tmp, 512);
 							currentParam->InstanceGroupName = tStrToUtf8(tmp);
@@ -1028,7 +1028,7 @@ INT_PTR CALLBACK LightmapDialogCallback (
 {
 	CLodDialogBoxParam *currentParam=(CLodDialogBoxParam *)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
 
-	switch (uMsg) 
+	switch (uMsg)
 	{
 		case WM_INITDIALOG:
 		{
@@ -1050,7 +1050,7 @@ INT_PTR CALLBACK LightmapDialogCallback (
 			SendMessage (GetDlgItem (hwndDlg, IDC_LIGHT_DONT_CAST_SHADOW_EXTERIOR), BM_SETCHECK, currentParam->LightDontCastShadowExterior, 0);
 			SetWindowText (GetDlgItem (hwndDlg, IDC_EXPORT_LIGHTMAP_NAME), utf8ToTStr(currentParam->ExportLightMapName));
 			SendMessage (GetDlgItem (hwndDlg, IDC_REALTIME_LIGHT_AMBIENT_ADD_SUN), BM_SETCHECK, currentParam->RealTimeAmbientLightAddSun, 0);
-			
+
 			// Set enable disable
 			LightingStateChanged (hwndDlg, currentParam);
 
@@ -1062,7 +1062,7 @@ INT_PTR CALLBACK LightmapDialogCallback (
 			if( HIWORD(wParam) == BN_CLICKED )
 			{
 				HWND hwndButton = (HWND) lParam;
-				switch (LOWORD(wParam)) 
+				switch (LOWORD(wParam))
 				{
 					case IDC_RESET_NAME:
 						SetWindowText (GetDlgItem (hwndDlg, IDC_EXPORT_LIGHTMAP_NAME), _T("GlobalLight"));
@@ -1092,7 +1092,7 @@ INT_PTR CALLBACK LightmapDialogCallback (
 							GetWindowText (GetDlgItem (hwndDlg, IDC_EXPORT_LIGHTMAP_NAME), tmp, 512);
 							currentParam->ExportLightMapName = tStrToUtf8(tmp);
 							currentParam->RealTimeAmbientLightAddSun= SendMessage (GetDlgItem (hwndDlg, IDC_REALTIME_LIGHT_AMBIENT_ADD_SUN), BM_GETCHECK, 0, 0);
-								
+
 							// Get the acceleration type
 							if (IsDlgButtonChecked (hwndDlg, IDC_LIGHT_GROUP_ALWAYS) == BST_CHECKED)
 								currentParam->LightGroup = 0;
@@ -1154,7 +1154,7 @@ INT_PTR CALLBACK LightmapDialogCallback (
 			EndDialog(hwndDlg,1);
 		break;
 
-		case WM_DESTROY:						
+		case WM_DESTROY:
 		break;
 
 
@@ -1180,7 +1180,7 @@ void	Lightmap2StateChanged (HWND hwndDlg, CLodDialogBoxParam *currentParam)
 	EnableWindow (GetDlgItem(hwndDlg, IDC_LMC_AUTO_SETUP), enabled);
 	EnableWindow (GetDlgItem(hwndDlg, IDC_LMC_AUTO_SETUP_VISIBLEONLY), enabled);
 	EnableWindow (GetDlgItem(hwndDlg, IDC_LMC_COPY_FROM), enabled);
-	
+
 	// MAX enable/disable
 	uint i;
 	for(i=0;i<CLodDialogBoxParam::NumLightGroup;i++)
@@ -1190,14 +1190,14 @@ void	Lightmap2StateChanged (HWND hwndDlg, CLodDialogBoxParam *currentParam)
 	}
 
 	// Static Enable / Disable
-	uint	staticItems[]= {IDC_LMC_STATIC0, IDC_LMC_STATIC1, IDC_LMC_STATIC2, IDC_LMC_STATIC3, 
+	uint	staticItems[]= {IDC_LMC_STATIC0, IDC_LMC_STATIC1, IDC_LMC_STATIC2, IDC_LMC_STATIC3,
 		IDC_LMC_STATIC4, IDC_LMC_STATIC5, IDC_LMC_STATIC6, IDC_LMC_STATIC7, IDC_LMC_STATIC8, };
 	uint	numStaticItems= sizeof(staticItems) / sizeof(staticItems[0]);
 	for(i=0;i<numStaticItems;i++)
 	{
 		EnableWindow (GetDlgItem(hwndDlg, staticItems[i]), enabled);
 	}
-		
+
 }
 
 // ***************************************************************************
@@ -1208,7 +1208,7 @@ void	lmcAutoSetup(CLodDialogBoxParam *currentParam, bool visibleOnly)
 	// get all lightmap lights
 	std::vector<SLightBuild>		lights;
 	getLightmapLightBuilds(lights, theCNelExport._Ip->GetTime(), *theCNelExport._Ip, visibleOnly);
-	
+
 	// mean all light, by lightgroup
 	CRGBAF		sumAmbient[CLodDialogBoxParam::NumLightGroup];
 	CRGBAF		sumDiffuse[CLodDialogBoxParam::NumLightGroup];
@@ -1258,7 +1258,7 @@ void	lmcAutoSetup(CLodDialogBoxParam *currentParam, bool visibleOnly)
 			sumDiffuse[i]/= float(countDiffuse[i]);
 			diff= sumDiffuse[i];
 		}
-		
+
 		// change the control and value
 		currentParam->LMCAmbient[i]= amb;
 		currentParam->LMCAmbient[i].Ctrl->SetColor(RGB(amb.R, amb.G, amb.B));
@@ -1269,7 +1269,7 @@ void	lmcAutoSetup(CLodDialogBoxParam *currentParam, bool visibleOnly)
 
 
 // ***************************************************************************
-struct CLMCParamFrom 
+struct CLMCParamFrom
 {
 	bool		AmbFilter[CLodDialogBoxParam::NumLightGroup];
 	bool		DiffFilter[CLodDialogBoxParam::NumLightGroup];
@@ -1278,7 +1278,7 @@ struct CLMCParamFrom
 	std::vector<INode*>		Nodes;
 	// true if the user has clicked at least one item
 	bool		SelectionDone;
-	
+
 	CLMCParamFrom()
 	{
 		SelectionDone= false;
@@ -1311,8 +1311,8 @@ INT_PTR CALLBACK LMCCopyFromDialogCallback(
 {
 	CLMCParamFrom *lmcParam=(CLMCParamFrom *)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
 	uint	i;
-	
-	switch (uMsg) 
+
+	switch (uMsg)
 	{
 	case WM_INITDIALOG:
 		{
@@ -1336,7 +1336,7 @@ INT_PTR CALLBACK LMCCopyFromDialogCallback(
 				lmcParam->AmbValue[i].Ctrl->SetColor(RGB(a.R, a.G, a.B));
 				lmcParam->DiffValue[i].Ctrl->SetColor(RGB(d.R, d.G, d.B));
 			}
-			
+
 			// init the filters.
 			nlctassert(CLodDialogBoxParam::NumLightGroup==3);
 			SendMessage (GetDlgItem (hwndDlg, IDC_LMC_COPY_ALWAYS_AMBIENT_FILTER), BM_SETCHECK, lmcParam->AmbFilter[0]?BST_CHECKED:BST_UNCHECKED, 0);
@@ -1345,7 +1345,7 @@ INT_PTR CALLBACK LMCCopyFromDialogCallback(
 			SendMessage (GetDlgItem (hwndDlg, IDC_LMC_COPY_ALWAYS_DIFFUSE_FILTER), BM_SETCHECK, lmcParam->DiffFilter[0]?BST_CHECKED:BST_UNCHECKED, 0);
 			SendMessage (GetDlgItem (hwndDlg, IDC_LMC_COPY_SUN_DIFFUSE_FILTER), BM_SETCHECK, lmcParam->DiffFilter[1]?BST_CHECKED:BST_UNCHECKED, 0);
 			SendMessage (GetDlgItem (hwndDlg, IDC_LMC_COPY_NIGHT_DIFFUSE_FILTER), BM_SETCHECK, lmcParam->DiffFilter[2]?BST_CHECKED:BST_UNCHECKED, 0);
-			
+
 			// init the list
 			HWND hwndList=GetDlgItem (hwndDlg, IDC_LMC_COPY_LIST);
 			for(i=0;i<lmcParam->Nodes.size();i++)
@@ -1355,7 +1355,7 @@ INT_PTR CALLBACK LMCCopyFromDialogCallback(
 				// Insert string
 				SendMessage (hwndList, LB_ADDSTRING, 0, (LPARAM) str.c_str());
 			}
-		
+
 			// gray the OK button
 			EnableWindow( GetDlgItem(hwndDlg, IDOK), FALSE);
 		}
@@ -1365,7 +1365,7 @@ INT_PTR CALLBACK LMCCopyFromDialogCallback(
 		if( HIWORD(wParam) == BN_CLICKED )
 		{
 			HWND hwndButton = (HWND) lParam;
-			switch (LOWORD(wParam)) 
+			switch (LOWORD(wParam))
 			{
 			case IDCANCEL:
 				EndDialog(hwndDlg, IDCANCEL);
@@ -1380,7 +1380,7 @@ INT_PTR CALLBACK LMCCopyFromDialogCallback(
 					lmcParam->DiffFilter[0]= SendMessage (GetDlgItem (hwndDlg, IDC_LMC_COPY_ALWAYS_DIFFUSE_FILTER), BM_GETCHECK, 0, 0) == BST_CHECKED;
 					lmcParam->DiffFilter[1]= SendMessage (GetDlgItem (hwndDlg, IDC_LMC_COPY_SUN_DIFFUSE_FILTER), BM_GETCHECK, 0, 0) == BST_CHECKED;
 					lmcParam->DiffFilter[2]= SendMessage (GetDlgItem (hwndDlg, IDC_LMC_COPY_NIGHT_DIFFUSE_FILTER), BM_GETCHECK, 0, 0) == BST_CHECKED;
-					
+
 					// get colors
 					for(i=0;i<CLodDialogBoxParam::NumLightGroup;i++)
 					{
@@ -1434,7 +1434,7 @@ INT_PTR CALLBACK LMCCopyFromDialogCallback(
 				// Get the node name
 				TCHAR name[512];
 				SendMessage (GetDlgItem (hwndDlg, IDC_LMC_COPY_LIST), LB_GETTEXT, wID, (LPARAM) (LPCTSTR) name);
-				
+
 				// Find the node
 				INode *nodeClk=theCNelExport._Ip->GetINodeByName(name);
 				if (nodeClk)
@@ -1454,17 +1454,17 @@ INT_PTR CALLBACK LMCCopyFromDialogCallback(
 				// ungray the OK button
 				EnableWindow( GetDlgItem(hwndDlg, IDOK), TRUE);
 			}
-					
+
 		}
 		break;
-		
+
 	case WM_CLOSE:
 		EndDialog(hwndDlg,IDCANCEL);
 		break;
-		
-	case WM_DESTROY:						
+
+	case WM_DESTROY:
 		break;
-		
+
 	default:
 		return FALSE;
 	}
@@ -1479,7 +1479,7 @@ void	lmcCopyFrom(CLodDialogBoxParam *currentParam, HWND parentDlg)
 
 	// static to save filter between calls
 	static CLMCParamFrom		paramLMCFrom;
-	
+
 	// **** get all nodes
 	// get all nodes
 	std::vector<INode*>	nodes;
@@ -1532,7 +1532,7 @@ INT_PTR CALLBACK Lightmap2DialogCallback (
 {
 	CLodDialogBoxParam *currentParam=(CLodDialogBoxParam *)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
 
-	switch (uMsg) 
+	switch (uMsg)
 	{
 		case WM_INITDIALOG:
 		{
@@ -1540,7 +1540,7 @@ INT_PTR CALLBACK Lightmap2DialogCallback (
 			LONG_PTR res = SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)lParam);
 			currentParam=(CLodDialogBoxParam *)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
 
-			// retrieve the color choosing Ctrl 
+			// retrieve the color choosing Ctrl
 			nlctassert(CLodDialogBoxParam::NumLightGroup==3);
 			nlverify(currentParam->LMCAmbient[0].Ctrl= GetIColorSwatch(GetDlgItem(hwndDlg, IDC_LM_ALWAYS_AMBIENT)));
 			nlverify(currentParam->LMCAmbient[1].Ctrl= GetIColorSwatch(GetDlgItem(hwndDlg, IDC_LM_DAY_AMBIENT)));
@@ -1548,7 +1548,7 @@ INT_PTR CALLBACK Lightmap2DialogCallback (
 			nlverify(currentParam->LMCDiffuse[0].Ctrl= GetIColorSwatch(GetDlgItem(hwndDlg, IDC_LM_ALWAYS_DIFFUSE)));
 			nlverify(currentParam->LMCDiffuse[1].Ctrl= GetIColorSwatch(GetDlgItem(hwndDlg, IDC_LM_DAY_DIFFUSE)));
 			nlverify(currentParam->LMCDiffuse[2].Ctrl= GetIColorSwatch(GetDlgItem(hwndDlg, IDC_LM_NIGHT_DIFFUSE)));
-			
+
 			// set color, and color state
 			for(uint i=0;i<CLodDialogBoxParam::NumLightGroup;i++)
 			{
@@ -1560,7 +1560,7 @@ INT_PTR CALLBACK Lightmap2DialogCallback (
 
 			// the enable button
 			SendMessage (GetDlgItem (hwndDlg, IDC_LM_COMPRESS_8BIT), BM_SETCHECK, currentParam->LMCEnabled, 0);
-			
+
 			// Set enable disable
 			Lightmap2StateChanged (hwndDlg, currentParam);
 		}
@@ -1570,7 +1570,7 @@ INT_PTR CALLBACK Lightmap2DialogCallback (
 			if( HIWORD(wParam) == BN_CLICKED )
 			{
 				HWND hwndButton = (HWND) lParam;
-				switch (LOWORD(wParam)) 
+				switch (LOWORD(wParam))
 				{
 					case IDCANCEL:
 						EndDialog(hwndDlg, IDCANCEL);
@@ -1616,7 +1616,7 @@ INT_PTR CALLBACK Lightmap2DialogCallback (
 			{
 				nlctassert(CLodDialogBoxParam::NumLightGroup==3);
 				CRGBAProp		*propEdited;
-				switch(LOWORD(wParam)) 
+				switch(LOWORD(wParam))
 				{
 				case IDC_LM_ALWAYS_AMBIENT:	propEdited= &currentParam->LMCAmbient[0]; break;
 				case IDC_LM_DAY_AMBIENT:	propEdited= &currentParam->LMCAmbient[1]; break;
@@ -1635,7 +1635,7 @@ INT_PTR CALLBACK Lightmap2DialogCallback (
 			EndDialog(hwndDlg,1);
 		break;
 
-		case WM_DESTROY:						
+		case WM_DESTROY:
 		break;
 
 		default:
@@ -1655,7 +1655,7 @@ INT_PTR CALLBACK VegetableDialogCallback (
 {
 	CLodDialogBoxParam *currentParam=(CLodDialogBoxParam *)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
 
-	switch (uMsg) 
+	switch (uMsg)
 	{
 		case WM_INITDIALOG:
 		{
@@ -1664,19 +1664,19 @@ INT_PTR CALLBACK VegetableDialogCallback (
 			currentParam=(CLodDialogBoxParam *)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
 
 			SendMessage (GetDlgItem (hwndDlg, IDC_VEGETABLE), BM_SETCHECK, currentParam->Vegetable, 0);
-			
+
 			// Yoyo: enable like this. Crappy CheckRadioButton method...
 			SendMessage (GetDlgItem (hwndDlg, IDC_VEGETABLE_ALPHA_BLEND_ON), BM_SETCHECK, currentParam->VegetableAlphaBlend==0, 0 );
 			SendMessage (GetDlgItem (hwndDlg, IDC_VEGETABLE_ALPHA_BLEND_OFF), BM_SETCHECK, currentParam->VegetableAlphaBlend==1, 0 );
-			
+
 			CheckRadioButton(hwndDlg, IDC_VEGETABLE_AB_ON_LIGHTED_PRECOMPUTED, IDC_VEGETABLE_AB_ON_UNLIGHTED, IDC_VEGETABLE_AB_ON_LIGHTED_PRECOMPUTED+currentParam->VegetableAlphaBlendOnLighted);
-			
+
 			CheckRadioButton(hwndDlg, IDC_VEGETABLE_AB_OFF_LIGHTED_PRECOMPUTED, IDC_VEGETABLE_AB_OFF_UNLIGHTED, IDC_VEGETABLE_AB_OFF_LIGHTED_PRECOMPUTED+currentParam->VegetableAlphaBlendOffLighted);
-			
+
 			SendMessage (GetDlgItem (hwndDlg, IDC_VEGETABLE_AB_OFF_DOUBLE_SIDED), BM_SETCHECK, currentParam->VegetableAlphaBlendOffDoubleSided, 0);
 
 			SendMessage (GetDlgItem (hwndDlg, IDC_VEGETABLE_FORCE_BEST_SIDED_LIGHTING), BM_SETCHECK, currentParam->VegetableForceBestSidedLighting, 0);
-			
+
 			CheckRadioButton(hwndDlg, IDC_CENTER_NULL, IDC_CENTER_Z, IDC_CENTER_NULL+currentParam->VegetableBendCenter);
 
 			SetWindowText (GetDlgItem (hwndDlg, IDC_VEGETABLE_BEND_FACTOR), utf8ToTStr(currentParam->VegetableBendFactor));
@@ -1689,7 +1689,7 @@ INT_PTR CALLBACK VegetableDialogCallback (
 			if( HIWORD(wParam) == BN_CLICKED )
 			{
 				HWND hwndButton = (HWND) lParam;
-				switch (LOWORD(wParam)) 
+				switch (LOWORD(wParam))
 				{
 					case IDCANCEL:
 						EndDialog(hwndDlg, IDCANCEL);
@@ -1702,25 +1702,25 @@ INT_PTR CALLBACK VegetableDialogCallback (
 								currentParam->VegetableAlphaBlend = 0;
 							else if (IsDlgButtonChecked (hwndDlg, IDC_VEGETABLE_ALPHA_BLEND_OFF) == BST_CHECKED)
 								currentParam->VegetableAlphaBlend = 1;
-							else 
+							else
 								currentParam->VegetableAlphaBlend = -1;
-							
+
 							if (IsDlgButtonChecked (hwndDlg, IDC_VEGETABLE_AB_ON_LIGHTED_PRECOMPUTED) == BST_CHECKED)
 								currentParam->VegetableAlphaBlendOnLighted = 0;
 							else if (IsDlgButtonChecked (hwndDlg, IDC_VEGETABLE_AB_ON_UNLIGHTED) == BST_CHECKED)
 								currentParam->VegetableAlphaBlendOnLighted = 1;
-							else 
+							else
 								currentParam->VegetableAlphaBlendOnLighted = -1;
-							
+
 							if (IsDlgButtonChecked (hwndDlg, IDC_VEGETABLE_AB_OFF_LIGHTED_PRECOMPUTED) == BST_CHECKED)
 								currentParam->VegetableAlphaBlendOffLighted = 0;
 							else if (IsDlgButtonChecked (hwndDlg, IDC_VEGETABLE_AB_OFF_LIGHTED_DYNAMIC) == BST_CHECKED)
 								currentParam->VegetableAlphaBlendOffLighted = 1;
 							else if (IsDlgButtonChecked (hwndDlg, IDC_VEGETABLE_AB_OFF_UNLIGHTED) == BST_CHECKED)
 								currentParam->VegetableAlphaBlendOffLighted = 2;
-							else 
+							else
 								currentParam->VegetableAlphaBlendOffLighted = -1;
-							
+
 							currentParam->VegetableAlphaBlendOffDoubleSided = SendMessage (GetDlgItem (hwndDlg, IDC_VEGETABLE_AB_OFF_DOUBLE_SIDED), BM_GETCHECK, 0, 0);
 
 							currentParam->VegetableForceBestSidedLighting= SendMessage (GetDlgItem (hwndDlg, IDC_VEGETABLE_FORCE_BEST_SIDED_LIGHTING), BM_GETCHECK, 0, 0);
@@ -1729,9 +1729,9 @@ INT_PTR CALLBACK VegetableDialogCallback (
 								currentParam->VegetableBendCenter = 0;
 							else if (IsDlgButtonChecked (hwndDlg, IDC_CENTER_Z) == BST_CHECKED)
 								currentParam->VegetableBendCenter = 1;
-							else 
+							else
 								currentParam->VegetableBendCenter = -1;
-							
+
 							TCHAR tmp[512];
 							GetWindowText (GetDlgItem (hwndDlg, IDC_VEGETABLE_BEND_FACTOR), tmp, 512);
 							currentParam->VegetableBendFactor = tStrToUtf8(tmp);
@@ -1775,7 +1775,7 @@ INT_PTR CALLBACK VertexProgramDialogCallBack (
 {
 	CLodDialogBoxParam *currentParam=(CLodDialogBoxParam *)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
 
-	switch (uMsg) 
+	switch (uMsg)
 	{
 		case WM_INITDIALOG:
 		{
@@ -1789,8 +1789,8 @@ INT_PTR CALLBACK VertexProgramDialogCallBack (
 				if(currentParam->VertexProgramId>=0)
 				{
 					// Init DropList.
-					SendDlgItemMessage(hwndDlg, IDC_COMBO_VP, CB_ADDSTRING, 0, (LPARAM)"Disable");
-					SendDlgItemMessage(hwndDlg, IDC_COMBO_VP, CB_ADDSTRING, 0, (LPARAM)"Wind Tree");
+					SendDlgItemMessage(hwndDlg, IDC_COMBO_VP, CB_ADDSTRING, 0, (LPARAM)_T("Disable"));
+					SendDlgItemMessage(hwndDlg, IDC_COMBO_VP, CB_ADDSTRING, 0, (LPARAM)_T("Wind Tree"));
 					SendDlgItemMessage(hwndDlg, IDC_COMBO_VP, CB_SETCURSEL, currentParam->VertexProgramId, 0);
 					EnableWindow( GetDlgItem(hwndDlg, IDC_COMBO_VP), TRUE);
 				}
@@ -1823,7 +1823,7 @@ INT_PTR CALLBACK VertexProgramDialogCallBack (
 			for (uint vpId=0; vpId<VP_COUNT; vpId++)
 			{
 				// Create the dialog
-				currentParam->SubVPDlg[vpId] = CreateDialogParam (hInstance, MAKEINTRESOURCE(SubVPTab[vpId]), hwndDlg, SubVPProc[vpId], (LONG)lParam);
+				currentParam->SubVPDlg[vpId] = CreateDialogParam (hInstance, MAKEINTRESOURCE(SubVPTab[vpId]), hwndDlg, SubVPProc[vpId], lParam);
 
 				// To client coord
 				RECT client = tabRect;
@@ -1847,7 +1847,7 @@ INT_PTR CALLBACK VertexProgramDialogCallBack (
 			if( HIWORD(wParam) == BN_CLICKED )
 			{
 				HWND hwndButton = (HWND) lParam;
-				switch (LOWORD(wParam)) 
+				switch (LOWORD(wParam))
 				{
 					case IDCANCEL:
 						EndDialog(hwndDlg, IDCANCEL);
@@ -1933,7 +1933,7 @@ void	updateVPWTStatic(HWND hwndDlg, uint type, uint depth, const CVPWindTreeAppD
 	TCHAR	stmp[256];
 	float	nticks= CVPWindTreeAppData::NumTicks;
 	float	scale;
-	
+
 	// which scale??
 	switch(type)
 	{
@@ -1951,27 +1951,27 @@ void	updateVPWTStatic(HWND hwndDlg, uint type, uint depth, const CVPWindTreeAppD
 	// update static according to type.
 	switch(type)
 	{
-	case 0:	
+	case 0:
 		sliderValue= SendDlgItemMessage(hwndDlg, VPWTFreqSliderId[depth], TBM_GETPOS, 0, 0);
 		_stprintf(stmp, _T("%.2f"), scale * float(sliderValue)/nticks);
 		SetWindowText( GetDlgItem(hwndDlg, VPWTFreqStaticId[depth]), stmp );
 		break;
-	case 1:	
+	case 1:
 		sliderValue= SendDlgItemMessage(hwndDlg, VPWTFreqWDSliderId[depth], TBM_GETPOS, 0, 0);
 		_stprintf(stmp, _T("%.2f"), scale * float(sliderValue)/nticks);
 		SetWindowText( GetDlgItem(hwndDlg, VPWTFreqWDStaticId[depth]), stmp );
 		break;
-	case 2:	
+	case 2:
 		sliderValue= SendDlgItemMessage(hwndDlg, VPWTDistXYSliderId[depth], TBM_GETPOS, 0, 0);
 		_stprintf(stmp, _T("%.2f"), scale * float(sliderValue)/nticks);
 		SetWindowText( GetDlgItem(hwndDlg, VPWTDistXYStaticId[depth]), stmp );
 		break;
-	case 3:	
+	case 3:
 		sliderValue= SendDlgItemMessage(hwndDlg, VPWTDistZSliderId[depth], TBM_GETPOS, 0, 0);
 		_stprintf(stmp, _T("%.2f"), scale * float(sliderValue)/nticks);
 		SetWindowText( GetDlgItem(hwndDlg, VPWTDistZStaticId[depth]), stmp );
 		break;
-	case 4:	
+	case 4:
 		sliderValue= SendDlgItemMessage(hwndDlg, VPWTBiasSliderId[depth], TBM_GETPOS, 0, 0);
 		// expand to -2 to 2.
 		float	biasVal= 4 * float(sliderValue)/nticks - 2;
@@ -2041,10 +2041,10 @@ INT_PTR CALLBACK VPWindTreeCallback (
 {
 	CLodDialogBoxParam *currentParam=(CLodDialogBoxParam *)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
 
-	switch (uMsg) 
+	switch (uMsg)
 	{
 		case WM_INITDIALOG:
-		{ 
+		{
 			// Param pointers
 			LONG_PTR res = SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)lParam);
 			currentParam=(CLodDialogBoxParam *)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
@@ -2108,7 +2108,7 @@ INT_PTR CALLBACK VPWindTreeCallback (
 			if( HIWORD(wParam) == BN_CLICKED )
 			{
 				HWND hwndButton = (HWND) lParam;
-				switch (LOWORD(wParam)) 
+				switch (LOWORD(wParam))
 				{
 					case IDCANCEL:
 						EndDialog(hwndDlg, IDCANCEL);
@@ -2175,9 +2175,9 @@ INT_PTR CALLBACK VPWindTreeCallback (
 
 			// EditBox change: ...
 			if( HIWORD(wParam) == EN_KILLFOCUS || EnChangeReturn)
-			{				
-				switch (LOWORD(wParam)) 
-				{					
+			{
+				switch (LOWORD(wParam))
+				{
 					case IDC_EDIT_VPWT_FREQ_SCALE:
 					{
 						// Read FreqScale
@@ -2220,7 +2220,7 @@ INT_PTR CALLBACK VPWindTreeCallback (
 						SetWindowText( GetDlgItem(hwndDlg, IDC_EDIT_VPWT_DIST_SCALE), stmp );
 					}
 					break;
-				}				
+				}
 			}
 		}
 		break;
@@ -2279,10 +2279,10 @@ INT_PTR CALLBACK MiscDialogCallback (
 {
 	CLodDialogBoxParam *currentParam=(CLodDialogBoxParam *)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
 
-	switch (uMsg) 
+	switch (uMsg)
 	{
 		case WM_INITDIALOG:
-		{ 			
+		{
 			// Param pointers
 			LONG_PTR res = SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)lParam);
 			currentParam=(CLodDialogBoxParam *)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
@@ -2302,12 +2302,12 @@ INT_PTR CALLBACK MiscDialogCallback (
 
 			// Mesh interfaces
 			SetWindowText (GetDlgItem (hwndDlg, IDC_EDIT_INTERFACE_FILE), utf8ToTStr(currentParam->InterfaceFileName));
-			SetWindowText (GetDlgItem (hwndDlg, IDC_EDIT_INTERFACE_THRESHOLD), 
+			SetWindowText (GetDlgItem (hwndDlg, IDC_EDIT_INTERFACE_THRESHOLD),
 							currentParam->InterfaceThreshold != -1.f ? utf8ToTStr(toStringMax(currentParam->InterfaceThreshold))
 																	 : _T("")
 						  );
 			SendMessage(GetDlgItem(hwndDlg, IDC_GET_INTERFACE_NORMAL_FROM_SCENE_OBJECTS), BM_SETCHECK, currentParam->GetInterfaceNormalsFromSceneObjects, 0);
-			
+
 			// Skeleton Scale
 			SendMessage( GetDlgItem(hwndDlg, IDC_EXPORT_BONE_SCALE), BM_SETCHECK, currentParam->ExportBoneScale, 0);
 			SetWindowText (GetDlgItem (hwndDlg, IDC_EXPORT_BONE_SCALE_NAME_EXT), utf8ToTStr(currentParam->ExportBoneScaleNameExt));
@@ -2325,7 +2325,7 @@ INT_PTR CALLBACK MiscDialogCallback (
 			if( HIWORD(wParam) == BN_CLICKED )
 			{
 				HWND hwndButton = (HWND) lParam;
-				switch (LOWORD(wParam)) 
+				switch (LOWORD(wParam))
 				{
 					case IDCANCEL:
 						EndDialog(hwndDlg, IDCANCEL);
@@ -2358,10 +2358,10 @@ INT_PTR CALLBACK MiscDialogCallback (
 							currentParam->InterfaceFileName = tStrToUtf8(tmp);
 							GetWindowText (GetDlgItem (hwndDlg, IDC_EDIT_INTERFACE_THRESHOLD), tmp, 512);
 							if (_tcslen(tmp) != 0)
-								currentParam->InterfaceThreshold = toFloatMax(tmp);							
+								currentParam->InterfaceThreshold = toFloatMax(tmp);
 							currentParam->GetInterfaceNormalsFromSceneObjects = SendMessage (GetDlgItem (hwndDlg, IDC_GET_INTERFACE_NORMAL_FROM_SCENE_OBJECTS), BM_GETCHECK, 0, 0);
-														
-							
+
+
 							// Skeleton Scale
 							currentParam->ExportBoneScale= SendMessage( GetDlgItem(hwndDlg, IDC_EXPORT_BONE_SCALE), BM_GETCHECK, 0, 0);
 							GetWindowText (GetDlgItem (hwndDlg, IDC_EXPORT_BONE_SCALE_NAME_EXT), tmp, 512);
@@ -2414,10 +2414,10 @@ INT_PTR CALLBACK AnimationDialogCallback (
 {
 	CLodDialogBoxParam *currentParam=(CLodDialogBoxParam *)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
 
-	switch (uMsg) 
+	switch (uMsg)
 	{
 		case WM_INITDIALOG:
-		{ 			
+		{
 			// Param pointers
 			LONG_PTR res = SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)lParam);
 			currentParam=(CLodDialogBoxParam *)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
@@ -2434,7 +2434,7 @@ INT_PTR CALLBACK AnimationDialogCallback (
 			if( HIWORD(wParam) == BN_CLICKED )
 			{
 				HWND hwndButton = (HWND) lParam;
-				switch (LOWORD(wParam)) 
+				switch (LOWORD(wParam))
 				{
 					case IDCANCEL:
 						EndDialog(hwndDlg, IDCANCEL);
@@ -2483,7 +2483,7 @@ INT_PTR CALLBACK LodDialogCallback (
 {
 	CLodDialogBoxParam *currentParam=(CLodDialogBoxParam *)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
 
-	switch (uMsg) 
+	switch (uMsg)
 	{
 		case WM_INITDIALOG:
 		{
@@ -2526,7 +2526,7 @@ INT_PTR CALLBACK LodDialogCallback (
 				SendMessage (GetDlgItem (hwndDlg, IDC_TAB), TCM_INSERTITEM, SendMessage (GetDlgItem (hwndDlg, IDC_TAB), TCM_GETITEMCOUNT, 0, 0), (LPARAM)&tabItem);
 
 				// Create the dialog
-				currentParam->SubDlg[tab] = CreateDialogParam (hInstance, MAKEINTRESOURCE(SubTab[tab]), GetDlgItem (hwndDlg, IDC_TAB), SubProc[tab], (LONG)lParam);
+				currentParam->SubDlg[tab] = CreateDialogParam (hInstance, MAKEINTRESOURCE(SubTab[tab]), GetDlgItem (hwndDlg, IDC_TAB), SubProc[tab], lParam);
 
 				// To client coord
 				RECT client = tabRect;
@@ -2551,7 +2551,7 @@ INT_PTR CALLBACK LodDialogCallback (
 				{
 				case TCN_SELCHANGE:
 					{
-						
+
 						uint curSel=SendMessage (pnmh->hwndFrom, TCM_GETCURSEL, 0, 0);
 						for (uint tab=0; tab<TAB_COUNT; tab++)
 						{
@@ -2568,7 +2568,7 @@ INT_PTR CALLBACK LodDialogCallback (
 			if( HIWORD(wParam) == BN_CLICKED )
 			{
 				HWND hwndButton = (HWND) lParam;
-				switch (LOWORD(wParam)) 
+				switch (LOWORD(wParam))
 				{
 					case IDCANCEL:
 						EndDialog(hwndDlg, IDCANCEL);
@@ -2593,9 +2593,9 @@ INT_PTR CALLBACK LodDialogCallback (
 			EndDialog(hwndDlg,1);
 		break;
 
-		case WM_DESTROY:						
+		case WM_DESTROY:
 		break;
-	
+
 		default:
 		return FALSE;
 	}
@@ -2607,7 +2607,7 @@ INT_PTR CALLBACK LodDialogCallback (
 void CNelExport::OnNodeProperties (const std::set<INode*> &listNode)
 {
 
-	// Get 
+	// Get
 	uint nNumSelNode=(uint)listNode.size();
 
 	if (nNumSelNode)
@@ -2780,13 +2780,13 @@ void CNelExport::OnNodeProperties (const std::set<INode*> &listNode)
 			param.LMCAmbient[i]= CExportNel::getScriptAppData (node, NEL3D_APPDATA_EXPORT_LMC_AMBIENT_START+i, CRGBA::Black);
 			param.LMCDiffuse[i]= CExportNel::getScriptAppData (node, NEL3D_APPDATA_EXPORT_LMC_DIFFUSE_START+i, CRGBA::White);
 		}
-		
+
 		// CollisionMeshGeneration
 		param.CollisionMeshGeneration=CExportNel::getScriptAppData (node, NEL3D_APPDATA_CAMERA_COLLISION_MESH_GENERATION, 0);
-		
+
 		// RealTimeAmbientLightAddSun
 		param.RealTimeAmbientLightAddSun= CExportNel::getScriptAppData (node, NEL3D_APPDATA_REALTIME_AMBIENT_ADD_SUN, BST_UNCHECKED);
-		
+
 		// Something selected ?
 		std::set<INode*>::const_iterator ite=listNode.begin();
 		ite++;
@@ -2902,7 +2902,7 @@ void CNelExport::OnNodeProperties (const std::set<INode*> &listNode)
 				param.RemanenceRollupRatio = -1.f;
 			if (CExportNel::getScriptAppData (node, NEL3D_APPDATA_REMANENCE_SLICE_NUMBER, 64)!=param.RemanenceSliceNumber)
 				param.RemanenceSliceNumber = -1;
-			
+
 
 			// Radial normals
 			for (uint smoothGroup=0; smoothGroup<NEL3D_RADIAL_NORMAL_COUNT; smoothGroup++)
@@ -3004,9 +3004,9 @@ void CNelExport::OnNodeProperties (const std::set<INode*> &listNode)
 			if (CExportNel::getScriptAppData (node, NEL3D_APPDATA_LIGHT_DONT_CAST_SHADOW_EXTERIOR, BST_UNCHECKED) != param.LightDontCastShadowExterior)
 				param.LightDontCastShadowExterior= BST_INDETERMINATE;
 
-			
+
 			// VertexProgram
-			// simply disable VertexProgram edition of multiple selection... 
+			// simply disable VertexProgram edition of multiple selection...
 			param.VertexProgramId= -1;
 
 			// Collision
@@ -3037,15 +3037,15 @@ void CNelExport::OnNodeProperties (const std::set<INode*> &listNode)
 				if(CExportNel::getScriptAppData (node, NEL3D_APPDATA_EXPORT_LMC_DIFFUSE_START+i, CRGBA::White) != param.LMCDiffuse[i])
 					param.LMCDiffuse[i].setDifferentValuesMode();
 			}
-			
+
 			// CollisionMeshGeneration
 			if (CExportNel::getScriptAppData (node, NEL3D_APPDATA_CAMERA_COLLISION_MESH_GENERATION, 0)!=param.CollisionMeshGeneration)
 				param.CollisionMeshGeneration = -1;
-			
+
 			// RealTimeAmbientLightAddSun
 			if (CExportNel::getScriptAppData (node, NEL3D_APPDATA_REALTIME_AMBIENT_ADD_SUN, BST_UNCHECKED) != param.RealTimeAmbientLightAddSun)
 				param.RealTimeAmbientLightAddSun= BST_INDETERMINATE;
-			
+
 			// Next sel
 			ite++;
 		}
@@ -3154,22 +3154,22 @@ void CNelExport::OnNodeProperties (const std::set<INode*> &listNode)
 				}
 
 				if ( (param.InstanceShape != DIFFERENT_VALUE_STRING) || (listNode.size()==1))
-					CExportNel::setScriptAppData (node, NEL3D_APPDATA_INSTANCE_SHAPE, param.InstanceShape);				
+					CExportNel::setScriptAppData (node, NEL3D_APPDATA_INSTANCE_SHAPE, param.InstanceShape);
 				if (param.InstanceName != DIFFERENT_VALUE_STRING)
-					CExportNel::setScriptAppData (node, NEL3D_APPDATA_INSTANCE_NAME, param.InstanceName);				
+					CExportNel::setScriptAppData (node, NEL3D_APPDATA_INSTANCE_NAME, param.InstanceName);
 				if (param.DontAddToScene != BST_INDETERMINATE)
 					CExportNel::setScriptAppData (node, NEL3D_APPDATA_DONT_ADD_TO_SCENE, param.DontAddToScene);
 				if (param.AutomaticAnimation != BST_INDETERMINATE)
 					CExportNel::setScriptAppData (node, NEL3D_APPDATA_AUTOMATIC_ANIMATION, param.AutomaticAnimation);
 				if (param.InstanceGroupName != DIFFERENT_VALUE_STRING)
-					CExportNel::setScriptAppData (node, NEL3D_APPDATA_IGNAME, param.InstanceGroupName);				
+					CExportNel::setScriptAppData (node, NEL3D_APPDATA_IGNAME, param.InstanceGroupName);
 				if (param.InterfaceFileName != "")
 					CExportNel::setScriptAppData (node, NEL3D_APPDATA_INTERFACE_FILE, param.InterfaceFileName);
 				if (param.InterfaceThreshold != -1)
 					CExportNel::setScriptAppData (node, NEL3D_APPDATA_INTERFACE_THRESHOLD, param.InterfaceThreshold);
 				if (param.GetInterfaceNormalsFromSceneObjects != BST_INDETERMINATE)
 					CExportNel::setScriptAppData (node, NEL3D_APPDATA_GET_INTERFACE_NORMAL_FROM_SCENE_OBJECTS, param.GetInterfaceNormalsFromSceneObjects);
-		
+
 				if (param.LightGroup != -1)
 					CExportNel::setScriptAppData (node, NEL3D_APPDATA_LM_LIGHT_GROUP, param.LightGroup);
 
@@ -3195,7 +3195,7 @@ void CNelExport::OnNodeProperties (const std::set<INode*> &listNode)
 						CExportNel::setScriptAppData (node, NEL3D_APPDATA_RADIAL_NORMAL_SM+smoothGroup, param.RadialNormals[smoothGroup]);
 				}
 
-				
+
 				if (param.LumelSizeMul != DIFFERENT_VALUE_STRING)
 					CExportNel::setScriptAppData (node, NEL3D_APPDATA_LUMELSIZEMUL, param.LumelSizeMul);
 				if (param.SoftShadowRadius != DIFFERENT_VALUE_STRING)
@@ -3228,7 +3228,7 @@ void CNelExport::OnNodeProperties (const std::set<INode*> &listNode)
 					// Write size of the list
 					uint sizeList=std::min ((uint)param.ListLodName.size(), (uint)NEL3D_APPDATA_LOD_NAME_COUNT_MAX);
 					CExportNel::setScriptAppData (node, NEL3D_APPDATA_LOD_NAME_COUNT, (int)sizeList);
-				
+
 					// Write the strings
 					uint stringIndex=0;
 					std::list<std::string>::iterator ite=param.ListLodName.begin();
@@ -3289,7 +3289,7 @@ void CNelExport::OnNodeProperties (const std::set<INode*> &listNode)
 				if (param.VertexProgramId!=-1)
 				{
 					CExportNel::setScriptAppData (node, NEL3D_APPDATA_VERTEXPROGRAM_ID, param.VertexProgramId);
-					// according to VertexProgram, change setup 
+					// according to VertexProgram, change setup
 					if(param.VertexProgramId==1)
 					{
 						CExportNel::setScriptAppDataVPWT(node, param.VertexProgramWindTree);
@@ -3346,15 +3346,15 @@ void CNelExport::OnNodeProperties (const std::set<INode*> &listNode)
 						CExportNel::setScriptAppData (node, NEL3D_APPDATA_EXPORT_LMC_DIFFUSE_START+i, col);
 					}
 				}
-				
+
 				// CollisionMeshGeneration
 				if (param.CollisionMeshGeneration != -1)
 					CExportNel::setScriptAppData (node, NEL3D_APPDATA_CAMERA_COLLISION_MESH_GENERATION, param.CollisionMeshGeneration);
-				
+
 				// RealTimeAmbientLightAddSun.
 				if (param.RealTimeAmbientLightAddSun != BST_INDETERMINATE)
 					CExportNel::setScriptAppData (node, NEL3D_APPDATA_REALTIME_AMBIENT_ADD_SUN, param.RealTimeAmbientLightAddSun);
-				
+
 				// Next node
 				ite++;
 			}
diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_misc.cpp b/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_misc.cpp
index 908d87c6d..7af1a7bc5 100644
--- a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_misc.cpp
+++ b/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_misc.cpp
@@ -95,9 +95,9 @@ Matrix3 CExportNel::viewMatrix2CameraMatrix (const Matrix3& viewMatrix)
 // ConvertMatrix a 3dsmax vector in NeL matrix
 void CExportNel::convertVector (CVector& nelVector, const Point3& maxVector)
 {
-	nelVector.x = maxVector.x;	
-	nelVector.y = maxVector.y;	
-	nelVector.z = maxVector.z;	
+	nelVector.x = maxVector.x;
+	nelVector.y = maxVector.y;
+	nelVector.z = maxVector.z;
 }
 
 
@@ -409,7 +409,7 @@ bool getValueByNameUsingParamBlock2Internal (Animatable& node, const char* sName
 				}
 				else
 				{
-					nlwarning("Invalid type specified for pblock2 value with name '%s', given type '%u', found '%u'", 
+					nlwarning("Invalid type specified for pblock2 value with name '%s', given type '%u', found '%u'",
 						sName, (uint32)type, (uint32)paramType);
 				}
 			}
@@ -476,12 +476,12 @@ Modifier* CExportNel::getModifier (INode* pNode, Class_ID modCID)
 		int m;
 		int nNumMods = pDObj->NumModifiers();
 		// Step through all modififers and verify the class id
-		for (m=0; m<nNumMods; ++m) 
+		for (m=0; m<nNumMods; ++m)
 		{
 			Modifier* pMod = pDObj->GetModifier(m);
-			if (pMod) 
+			if (pMod)
 			{
-				if (pMod->ClassID() == modCID) 
+				if (pMod->ClassID() == modCID)
 				{
 					// Match! Return it
 					return pMod;
@@ -528,22 +528,22 @@ std::string		CExportNel::getNelObjectName (INode& node)
 	if (obj)
 	{
 		Class_ID  clid = obj->ClassID();
-		// is the object a particle system ? (we do this defore meshs, because for now there is a mesh in max scenes to say where a particle system is...)		
+		// is the object a particle system ? (we do this defore meshs, because for now there is a mesh in max scenes to say where a particle system is...)
 		if (clid.PartA() == NEL_PARTICLE_SYSTEM_CLASS_ID)
 		{
 			std::string shapeName;
 			if (CExportNel::getValueByNameUsingParamBlock2(node, "ps_file_name", (ParamType2) TYPE_STRING, &shapeName, 0))
 			{
 				return NLMISC::CFile::getFilename(shapeName);
-			}			
+			}
 		}
 	}
-	// Try to get an APPDATA for the name of the object			
+	// Try to get an APPDATA for the name of the object
 	AppDataChunk *ad = node.GetAppDataChunk (MAXSCRIPT_UTILITY_CLASS_ID, UTILITY_CLASS_ID, NEL3D_APPDATA_INSTANCE_SHAPE);
 	if (ad&&ad->data)
 	{
 		if (::strlen((const char *) ad->data) != 0)
-		{		
+		{
 			// Get the name of the object in the APP data
 			return (const char*)ad->data;
 		}
@@ -562,7 +562,7 @@ std::string		CExportNel::getNelObjectName (INode& node)
 			if (ad&&ad->data)
 			{
 				if (_tcslen((const TCHAR *) ad->data) != 0)
-				{				
+				{
 					// get file name only
 					return NLMISC::CFile::getFilename(tStrToUtf8((const TCHAR*)ad->data));
 				}
@@ -578,7 +578,7 @@ std::string		CExportNel::getNelObjectName (INode& node)
 			}
 		}
 		else
-		{		
+		{
 			// Extract the node name
 			return tStrToUtf8(node.GetName());
 		}
@@ -587,7 +587,7 @@ std::string		CExportNel::getNelObjectName (INode& node)
 
 // --------------------------------------------------
 
-void CExportNel::decompMatrix (NLMISC::CVector& nelScale, NLMISC::CQuat& nelRot, NLMISC::CVector& nelPos, 
+void CExportNel::decompMatrix (NLMISC::CVector& nelScale, NLMISC::CQuat& nelRot, NLMISC::CVector& nelPos,
 								const Matrix3& maxMatrix)
 {
 	// Use decomp part of the max SDK
@@ -601,7 +601,7 @@ void CExportNel::decompMatrix (NLMISC::CVector& nelScale, NLMISC::CQuat& nelRot,
 	parts.q.MakeMatrix(rtm);
 	parts.u.MakeMatrix(srtm);
 	stm = ScaleMatrix(parts.k);
-	ftm = ScaleMatrix(Point3(parts.f,parts.f,parts.f)); 
+	ftm = ScaleMatrix(Point3(parts.f,parts.f,parts.f));
 	Matrix3 mat = Inverse(srtm) * stm * srtm * rtm * ftm * ptm;
 
 	// Set the translation
@@ -841,7 +841,7 @@ void CExportNel::addParentLodNode (INode &child, std::set<INode*> &lodListToExcl
 	if (parent == NULL)
 		parent = _Ip->GetRootNode();
 
-	// Get its child lod 
+	// Get its child lod
 	uint lodCount = getScriptAppData (parent, NEL3D_APPDATA_LOD_NAME_COUNT, 0);
 	for (uint lod=0; lod<lodCount; lod++)
 	{
@@ -894,13 +894,13 @@ void CExportNel::uvMatrix2NelUVMatrix (const Matrix3& maxMatrix, NLMISC::CMatrix
 	dest.identity();
 
 	// Set the rotation part
-	dest.setRot(I, J, K); 
+	dest.setRot(I, J, K);
 
 	// Set the position part
-	dest.setPos(P);	
+	dest.setPos(P);
 
 	// transfo matrix
-	
+
 	CMatrix convert;
 	convert.setRot(CVector::I, -CVector::J, CVector::K);
 	convert.setPos(CVector::J);
@@ -967,7 +967,7 @@ struct CMaxMeshSeg
 	uint V0, V1;
 	// for map insertion
 	bool operator<(const CMaxMeshSeg &other) const
-	{ 
+	{
 		uint lv0 = std::min(V0, V1);
 		uint lv1 = std::max(V0, V1);
 
@@ -983,8 +983,8 @@ struct CMaxMeshSeg
 		return !(*this < other) && !(other < *this);
 	}
 	CMaxMeshSeg(uint v0, uint v1) : V0(v0),
-							 V1(v1)				
-	{			
+							 V1(v1)
+	{
 	}
 };
 
@@ -993,7 +993,7 @@ struct CPredNextSegOf
 {
 	uint Prev;
 	CPredNextSegOf(uint prev) : Prev(prev) {}
-	bool operator()(const CMaxMeshSeg &value) const { return value.V0 == Prev || value.V1 == Prev; }		
+	bool operator()(const CMaxMeshSeg &value) const { return value.V0 == Prev || value.V1 == Prev; }
 };
 
 /// Get normal of a max triangle in nel format
@@ -1009,7 +1009,7 @@ static NLMISC::CVector getMaxFaceNormal(const Mesh &m, const NLMISC::CMatrix &ba
 	normal.normalize();
 	return normal;
 }
-  
+
 
 
 
@@ -1017,11 +1017,11 @@ static NLMISC::CVector getMaxFaceNormal(const Mesh &m, const NLMISC::CMatrix &ba
 // This convert a polygon expressed as a max mesh into a list of ordered vectors
 void CExportNel::maxPolygonMeshToOrderedPoly(Mesh &mesh, std::vector<NLMISC::CVector> &dest, const NLMISC::CMatrix &basis, NLMISC::CVector &avgNormal)
 {
-	/// We use a very simple (but slow) algo : examine for each segment how many tris share it. If it is one then it is a border seg	 
+	/// We use a very simple (but slow) algo : examine for each segment how many tris share it. If it is one then it is a border seg
 	/// Then, just order segments
-	
-	typedef std::map<CMaxMeshSeg, uint> TSegMap;		
-		
+
+	typedef std::map<CMaxMeshSeg, uint> TSegMap;
+
 	avgNormal.set(0, 0, 0);
 
 	/////////////////////////////////////////////////////////////
@@ -1056,15 +1056,15 @@ void CExportNel::maxPolygonMeshToOrderedPoly(Mesh &mesh, std::vector<NLMISC::CVe
 	// keep segments for which nbref is 1 //
 	////////////////////////////////////////
 
-	typedef std::list<CMaxMeshSeg> TSegList;	
-	TSegList borderSegs;	
+	typedef std::list<CMaxMeshSeg> TSegList;
+	TSegList borderSegs;
 	for(TSegMap::const_iterator it = segs.begin(); it != segs.end(); ++it)
 	{
 		if (it->second == 1) borderSegs.push_back(it->first);
 	}
 
 
-	
+
 	dest.clear();
 	if (borderSegs.empty()) return;
 
@@ -1081,9 +1081,9 @@ void CExportNel::maxPolygonMeshToOrderedPoly(Mesh &mesh, std::vector<NLMISC::CVe
 	for(;;)
 	{
 		TSegList::iterator nextSeg = std::find_if(borderSegs.begin(), borderSegs.end(), CPredNextSegOf(nextToFind));
-		if (nextSeg == borderSegs.end()) return;					
+		if (nextSeg == borderSegs.end()) return;
 		CExportNel::convertVector(pos, mesh.verts[nextSeg->V0 == nextToFind ? nextSeg->V0 : nextSeg->V1]);
-		dest.push_back(basis * pos);	
+		dest.push_back(basis * pos);
 		nextToFind = (nextSeg->V0 == nextToFind) ? nextSeg->V1 : nextSeg->V0;
 		borderSegs.erase(nextSeg);
 	}
@@ -1096,14 +1096,14 @@ void CExportNel::maxPolygonMeshToOrderedPoly(Mesh &mesh, std::vector<NLMISC::CVe
 static std::string OldDecimalSeparatorLocale;
 
 static void setDecimalSeparatorAsPoint()
-{				
+{
 	OldDecimalSeparatorLocale = ::setlocale(LC_NUMERIC, NULL);
-	::setlocale(LC_NUMERIC, "English");	
+	::setlocale(LC_NUMERIC, "C");
 }
 
 static void restoreDecimalSeparator()
-{	
-	::setlocale(LC_NUMERIC, OldDecimalSeparatorLocale.c_str());		
+{
+	::setlocale(LC_NUMERIC, OldDecimalSeparatorLocale.c_str());
 }
 
 
@@ -1128,7 +1128,7 @@ bool toFloatMax(const TCHAR *src, float &dest)
 }
 
 bool toFloatMax(const std::string &src, float &dest)
-{	
+{
 	setDecimalSeparatorAsPoint();
 	std::string str(src);
 	std::string::size_type pointPos = str.find_first_of(",");
@@ -1158,17 +1158,17 @@ bool toFloatMax(const std::string &src, float &dest)
 		result += (float) (*src - '0');
 		++src;
 	}
-	if (!(*src == '.' || *src == ',')) 
-	{	
+	if (!(*src == '.' || *src == ','))
+	{
 		if (numberFound)
-		{		
+		{
 			dest = sgn * result;
 			return true;
 		}
 		else
 			return false;
 	}
-	++src;		
+	++src;
 	if (!::isdigit(*src))
 	{
 		if (!numberFound)
@@ -1176,9 +1176,9 @@ bool toFloatMax(const std::string &src, float &dest)
 			return false;
 		}
 	}
-	float addValue = 0.1f;	
+	float addValue = 0.1f;
 	while (::isdigit(*src))
-	{	
+	{
 		result += addValue * (float) (*src - '0');
 		addValue *= 0.1f;
 		++ src;
@@ -1217,15 +1217,15 @@ std::string toStringMax(float value)
 	do
 	{
 		value *= 10.f;
-		frac = (float) ::modf((double) value, &intPart);		
-		result += toString((int) intPart % 10);		
+		frac = (float) ::modf((double) value, &intPart);
+		result += toString((int) intPart % 10);
 	}
 	while (frac != 0.f);
 	return positive ? result : "-" + result;*/
 }
 ///=======================================================================
 std::string toStringMax(int value)
-{	
+{
 	char result[256];
 	setDecimalSeparatorAsPoint();
 	::sprintf(result, "%d", value);
@@ -1233,7 +1233,7 @@ std::string toStringMax(int value)
 	return result;
 
 	/*char str[256];
-	::sprintf(str, "%d", value);	
+	::sprintf(str, "%d", value);
 	return str;*/
 }
 ///=======================================================================
diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_radial_normal.cpp b/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_radial_normal.cpp
index d623b7269..80f57bfb4 100644
--- a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_radial_normal.cpp
+++ b/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_radial_normal.cpp
@@ -56,7 +56,7 @@ void CRadialVertices::init (INode *node, Mesh *mesh, TimeValue time, Interface &
 		string pivotName = CExportNel::getScriptAppData (_NodePtr, NEL3D_APPDATA_RADIAL_NORMAL_SM+app-NEL3D_RADIAL_FIRST_SM, "");
 
 		// Active ?
-		if (pivotName != "")
+		if (!pivotName.empty())
 		{
 			// Add the mask
 			_SmoothingGroupMask |= (1<<app);
@@ -79,7 +79,7 @@ void CRadialVertices::init (INode *node, Mesh *mesh, TimeValue time, Interface &
 			{
 				// Output error message
 				char msg[512];
-				smprintf (msg, 512, "Can't find pivot node named %s", pivotName);
+				smprintf (msg, 512, "Can't find pivot node named '%s' of length %u", pivotName.c_str(), (uint)pivotName.length());
 				nelExport.outputErrorMessage (msg);
 			}
 		}
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_surface.cpp b/code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_surface.cpp
index 4f72420b1..e5f2220ba 100644
--- a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_surface.cpp
+++ b/code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_surface.cpp
@@ -33,13 +33,13 @@ INT_PTR CALLBACK SelectByMatDlgProc(
 		case WM_COMMAND:
 			switch (LOWORD(wParam))
 			{
-				case IDOK: 
+				case IDOK:
 					{
 					ISpinnerControl *spin = GetISpinner(GetDlgItem(hWnd, IDC_MAT_IDSPIN));
 					param[0] = spin->GetIVal();
 					param[1] = IsDlgButtonChecked(hWnd, IDC_CLEARSELECTION);
 					ReleaseISpinner(spin);
-					EndDialog(hWnd, 1);					
+					EndDialog(hWnd, 1);
 					break;
 					}
 
@@ -57,7 +57,7 @@ INT_PTR CALLBACK SelectByMatDlgProc(
 
 // ------------------------------------------------------------------------------------------------------------------------------------------------------
 
-void SetSmoothButtonState(HWND hWnd, DWORD bits, DWORD invalid, DWORD unused = 0) 
+void SetSmoothButtonState(HWND hWnd, DWORD bits, DWORD invalid, DWORD unused = 0)
 {
 	for (int i = IDC_SMOOTH_GRP1; i < IDC_SMOOTH_GRP1 + 32; i++)
 	{
@@ -71,7 +71,7 @@ void SetSmoothButtonState(HWND hWnd, DWORD bits, DWORD invalid, DWORD unused = 0
 		{
 			SetWindowText(GetDlgItem(hWnd, i), NULL);
 			SendMessage(GetDlgItem(hWnd, i), CC_COMMAND, CC_CMD_SET_STATE, FALSE);
-		} else 
+		} else
 		{
 			TSTR buf;
 			buf.printf(_T("%d"), i - IDC_SMOOTH_GRP1 + 1);
@@ -84,7 +84,7 @@ void SetSmoothButtonState(HWND hWnd, DWORD bits, DWORD invalid, DWORD unused = 0
 
 // ------------------------------------------------------------------------------------------------------------------------------------------------------
 
-INT_PTR CALLBACK SelectBySmoothDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) 
+INT_PTR CALLBACK SelectBySmoothDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	static DWORD *param;
 	switch (msg)
@@ -99,19 +99,19 @@ INT_PTR CALLBACK SelectBySmoothDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARA
 		CenterWindow(hWnd, GetParent(hWnd));
 		break;
 
-	case WM_COMMAND: 
+	case WM_COMMAND:
 		if (LOWORD(wParam) >= IDC_SMOOTH_GRP1 &&
 			LOWORD(wParam) <= IDC_SMOOTH_GRP32)
 		{
-			ICustButton *iBut = GetICustButton(GetDlgItem(hWnd, LOWORD(wParam)));				
-			int shift = LOWORD(wParam) - IDC_SMOOTH_GRP1;				
+			ICustButton *iBut = GetICustButton(GetDlgItem(hWnd, LOWORD(wParam)));
+			int shift = LOWORD(wParam) - IDC_SMOOTH_GRP1;
 			if (iBut->IsChecked())
 			{
 				param[0] |= 1 << shift;
-			} else 
+			} else
 			{
 				param[0] &= ~(1 << shift);
-			}				
+			}
 			ReleaseICustButton(iBut);
 			break;
 		}
@@ -119,15 +119,15 @@ INT_PTR CALLBACK SelectBySmoothDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARA
 		switch (LOWORD(wParam))
 		{
 		case IDOK:
-			param[1] = IsDlgButtonChecked(hWnd, IDC_CLEARSELECTION);					
-			EndDialog(hWnd, 1);					
-			break;					
+			param[1] = IsDlgButtonChecked(hWnd, IDC_CLEARSELECTION);
+			EndDialog(hWnd, 1);
+			break;
 
 		case IDCANCEL:
 			EndDialog(hWnd, 0);
 			break;
 		}
-		break;			
+		break;
 
 	default:
 		return FALSE;
@@ -142,10 +142,10 @@ INT_PTR CALLBACK PatchTileDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 	EditPatchMod *ep =(EditPatchMod *)GetWindowLongPtr(hDlg, GWLP_USERDATA);
 	if (!ep && message != WM_INITDIALOG)
 		return FALSE;
-	
+
 	switch (message)
 	{
-		case WM_INITDIALOG: 
+		case WM_INITDIALOG:
 			{
 
 		 	ep =(EditPatchMod *)lParam;
@@ -169,16 +169,16 @@ INT_PTR CALLBACK PatchTileDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 				ep->tileRot = NULL;
 			}
 			return FALSE;
-		
+
 		case CC_SPINNER_CHANGE:
 			/*switch (LOWORD(wParam))
 			{
-				case IDC_TILE_MAT_SPIN: 
+				case IDC_TILE_MAT_SPIN:
 					if (HIWORD(wParam))
 						break;		// No interactive action
 					ep->SetTileNum (ep->tileNum->GetIVal());
 					break;
-				case IDC_TILE_ROT_SPIN: 
+				case IDC_TILE_ROT_SPIN:
 					if (HIWORD(wParam))
 						break;		// No interactive action
 					ep->SetTileRot (ep->tileRot->GetIVal());
@@ -208,8 +208,8 @@ INT_PTR CALLBACK PatchTileDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 				if (u == 0xffffffff)
 				{
 					ep->tileNum->SetIndeterminate(TRUE);
-				} 
-				else 
+				}
+				else
 				{
 					ep->tileNum->SetIndeterminate(FALSE);
 					ep->tileNum->SetValue((int)u, FALSE);
@@ -220,30 +220,24 @@ INT_PTR CALLBACK PatchTileDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 				if (v == -1)
 				{
 					ep->tileRot->SetIndeterminate(TRUE);
-				} 
-				else 
+				}
+				else
 				{
 					ep->tileRot->SetIndeterminate(FALSE);
 					ep->tileRot->SetValue(v, FALSE);
 				}*/
-			
+
 				ep->patchUIValid = TRUE;
 			}
 			return FALSE;
 
-		case WM_LBUTTONDOWN:
-		case WM_LBUTTONUP:
-		case WM_MOUSEMOVE:   			
-   			ep->ip->RollupMouseMessage(hDlg, message, wParam, lParam);
-			return FALSE;		
-		
-		case WM_COMMAND:			
+		case WM_COMMAND:
 			/*switch (LOWORD(wParam))
 			{
 			}*/
 			break;
 		}
-	
+
 	return FALSE;
 }
 
@@ -254,10 +248,10 @@ INT_PTR CALLBACK PatchEdgeDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 	EditPatchMod *ep =(EditPatchMod *)GetWindowLongPtr(hDlg, GWLP_USERDATA);
 	if (!ep && message != WM_INITDIALOG)
 		return FALSE;
-	
+
 	switch (message)
 	{
-		case WM_INITDIALOG: 
+		case WM_INITDIALOG:
 			{
 
 		 	ep =(EditPatchMod *)lParam;
@@ -269,7 +263,7 @@ INT_PTR CALLBACK PatchEdgeDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 
 		case WM_DESTROY:
 			return FALSE;
-		
+
 		case WM_PAINT:
 			if (!ep->edgeUIValid)
 			{
@@ -298,15 +292,9 @@ INT_PTR CALLBACK PatchEdgeDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 			}
 			return FALSE;
 
-		case WM_LBUTTONDOWN:
-		case WM_LBUTTONUP:
-		case WM_MOUSEMOVE:   			
-   			ep->ip->RollupMouseMessage(hDlg, message, wParam, lParam);
-			return FALSE;		
-		
-		case WM_COMMAND:			
+		case WM_COMMAND:
 			switch (LOWORD(wParam))
-			{				
+			{
 				case IDC_NO_SMOOTH:
 					// 3 states management
 					if (IsDlgButtonChecked(hDlg, IDC_NO_SMOOTH)==BST_INDETERMINATE)
@@ -318,7 +306,7 @@ INT_PTR CALLBACK PatchEdgeDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 			}
 			break;
 		}
-	
+
 	return FALSE;
 }
 
@@ -329,21 +317,21 @@ INT_PTR CALLBACK PatchSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 	EditPatchMod *ep =(EditPatchMod *)GetWindowLongPtr(hDlg, GWLP_USERDATA);
 	if (!ep && message != WM_INITDIALOG)
 		return FALSE;
-	
+
 	switch (message)
 	{
-		case WM_INITDIALOG: 
+		case WM_INITDIALOG:
 			{
 			ep = (EditPatchMod *)lParam;
 		 	ep->hSurfPanel = hDlg;
 
 			for (int i = IDC_SMOOTH_GRP1; i < IDC_SMOOTH_GRP1 + 32; i++)
  				SendMessage(GetDlgItem(hDlg, i), CC_COMMAND, CC_CMD_SET_TYPE, CBT_CHECK);
- 			SetWindowLongPtr(hDlg, GWLP_USERDATA, (LONG_PTR)ep);		 	
+ 			SetWindowLongPtr(hDlg, GWLP_USERDATA, (LONG_PTR)ep);
  			ep->matSpin = SetupIntSpinner(hDlg, IDC_MAT_IDSPIN, IDC_MAT_ID, 1, MAX_MATID, 0);
  			ep->tessUSpin = SetupIntSpinner(hDlg, IDC_TESS_U_SPIN, IDC_TESS_U2, 1, 4, RPO_DEFAULT_TESSEL);
  			ep->tessVSpin = SetupIntSpinner(hDlg, IDC_TESS_V_SPIN, IDC_TESS_V2, 1, 4, RPO_DEFAULT_TESSEL);
-		 	
+
 			ep->SetSurfDlgEnables();
 
 			return TRUE;
@@ -366,17 +354,17 @@ INT_PTR CALLBACK PatchSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 				ep->tessVSpin = NULL;
 			}
 			return FALSE;
-		
+
 		case CC_SPINNER_CHANGE:
 			switch (LOWORD(wParam))
 			{
-				case IDC_MAT_IDSPIN: 
+				case IDC_MAT_IDSPIN:
 					if (HIWORD(wParam))
 						break;		// No interactive action
 					ep->SetSelMatIndex(ep->matSpin->GetIVal() - 1);
 					break;
-				case IDC_TESS_U_SPIN: 
-				case IDC_TESS_V_SPIN: 
+				case IDC_TESS_U_SPIN:
+				case IDC_TESS_V_SPIN:
 					if (HIWORD(wParam))
 						break;		// No interactive action
 					ep->SetSelTess(ep->tessUSpin->GetIVal(), ep->tessVSpin->GetIVal());
@@ -391,8 +379,8 @@ INT_PTR CALLBACK PatchSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 					ep->SetSelMatIndex(ep->matSpin->GetIVal() - 1);
 					ep->ip->RedrawViews(ep->ip->GetTime(), REDRAW_END);
 					break;
-				case IDC_TESS_U_SPIN: 
-				case IDC_TESS_V_SPIN: 
+				case IDC_TESS_U_SPIN:
+				case IDC_TESS_V_SPIN:
 					ep->SetSelTess(ep->tessUSpin->GetIVal(), ep->tessVSpin->GetIVal());
 					ep->ip->RedrawViews(ep->ip->GetTime(), REDRAW_END);
 					break;
@@ -407,8 +395,8 @@ INT_PTR CALLBACK PatchSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 				if (mat == -1)
 				{
 					ep->matSpin->SetIndeterminate(TRUE);
-				} 
-				else 
+				}
+				else
 				{
 					ep->matSpin->SetIndeterminate(FALSE);
 					ep->matSpin->SetValue(mat + 1, FALSE);
@@ -423,8 +411,8 @@ INT_PTR CALLBACK PatchSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 				if (u == -1)
 				{
 					ep->tessUSpin->SetIndeterminate(TRUE);
-				} 
-				else 
+				}
+				else
 				{
 					ep->tessUSpin->SetIndeterminate(FALSE);
 					ep->tessUSpin->SetValue(u, FALSE);
@@ -435,8 +423,8 @@ INT_PTR CALLBACK PatchSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 				if (v == -1)
 				{
 					ep->tessVSpin->SetIndeterminate(TRUE);
-				} 
-				else 
+				}
+				else
 				{
 					ep->tessVSpin->SetIndeterminate(FALSE);
 					ep->tessVSpin->SetValue(v, FALSE);
@@ -446,13 +434,7 @@ INT_PTR CALLBACK PatchSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 			}
 			return FALSE;
 
-		case WM_LBUTTONDOWN:
-		case WM_LBUTTONUP:
-		case WM_MOUSEMOVE:   			
-   			ep->ip->RollupMouseMessage(hDlg, message, wParam, lParam);
-			return FALSE;		
-		
-		case WM_COMMAND:			
+		case WM_COMMAND:
 			if (LOWORD(wParam) >= IDC_SMOOTH_GRP1 &&
 				LOWORD(wParam) <= IDC_SMOOTH_GRP32)
 			{
@@ -464,25 +446,25 @@ INT_PTR CALLBACK PatchSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 				break;
 			}
 			switch (LOWORD(wParam))
-			{				
+			{
 				// Material
-				case IDC_SELECT_BYID: 
-					{										
+				case IDC_SELECT_BYID:
+					{
 					if (DialogBoxParam(
-						hInstance, 
+						hInstance,
 						MAKEINTRESOURCE(IDD_SELECTBYMAT),
-						ep->ip->GetMAXHWnd(), 
+						ep->ip->GetMAXHWnd(),
 						SelectByMatDlgProc,
 						(LPARAM)sbmParams))
 					{
-					
+
 						ep->SelectByMat(sbmParams[0] - 1/*index*/, sbmParams[1]/*clear*/);
 					}
 					break;
 					}
 				// Smoothing groups
-				case IDC_SELECTBYSMOOTH: 
-					{										
+				case IDC_SELECTBYSMOOTH:
+					{
 					sbsParams[2] = ~ep->GetUsedSmoothBits();
 					if (DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_EM_SELECTBYSMOOTH),
 								ep->ip->GetMAXHWnd(), SelectBySmoothDlgProc, (LPARAM)sbsParams))
@@ -504,19 +486,19 @@ INT_PTR CALLBACK PatchSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 				}
 			break;
 		}
-	
+
 	return FALSE;
 }
 
 // ------------------------------------------------------------------------------------------------------------------------------------------------------
 
-void EditPatchMod::SetSurfDlgEnables() 
+void EditPatchMod::SetSurfDlgEnables()
 {
 	if (!hSurfPanel)
 		return;
-	
+
 	nlassert(ip);
-	
+
 	BOOL oType =(GetSubobjectLevel() == EP_OBJECT) ? TRUE : FALSE;
 	BOOL pType =(GetSubobjectLevel() == EP_PATCH) ? TRUE : FALSE;
 
@@ -550,13 +532,13 @@ void EditPatchMod::SetSurfDlgEnables()
 
 // ------------------------------------------------------------------------------------------------------------------------------------------------------
 
-void EditPatchMod::SetTileDlgEnables() 
+void EditPatchMod::SetTileDlgEnables()
 {
 	if (!hTilePanel)
 		return;
-	
+
 	nlassert(ip);
-	
+
 	BOOL oType =(GetSubobjectLevel() == EP_OBJECT) ? TRUE : FALSE;
 	BOOL pType =(GetSubobjectLevel() == EP_TILE) ? TRUE : FALSE;
 
@@ -568,13 +550,13 @@ void EditPatchMod::SetTileDlgEnables()
 
 // ------------------------------------------------------------------------------------------------------------------------------------------------------
 
-void EditPatchMod::SetEdgeDlgEnables() 
+void EditPatchMod::SetEdgeDlgEnables()
 {
 	if (!hEdgePanel)
 		return;
-	
+
 	nlassert(ip);
-	
+
 	BOOL oType =(GetSubobjectLevel() == EP_OBJECT) ? TRUE : FALSE;
 	BOOL pType =(GetSubobjectLevel() == EP_TILE) ? TRUE : FALSE;
 
@@ -591,14 +573,14 @@ DWORD EditPatchMod::GetSelSmoothBits(DWORD &invalid)
 	BOOL first = 1;
 	DWORD bits = 0;
 	invalid = 0;
-	ModContextList mcList;	
+	ModContextList mcList;
 	INodeTab nodes;
 
 	if (!ip)
 		return 0;
 	ip->GetModContexts(mcList, nodes);
 	ClearPatchDataFlag(mcList, EPD_BEENDONE);
-	
+
 	for (int i = 0; i < mcList.Count(); i++)
 	{
 		EditPatchData *patchData =(EditPatchData*)mcList[i]->localData;
@@ -619,8 +601,8 @@ DWORD EditPatchMod::GetSelSmoothBits(DWORD &invalid)
 				if (first)
 				{
 					first = FALSE;
-					bits  = patch->patches[j].smGroup;					
-				} else 
+					bits  = patch->patches[j].smGroup;
+				} else
 				{
 					if (patch->patches[j].smGroup != bits)
 					{
@@ -632,7 +614,7 @@ DWORD EditPatchMod::GetSelSmoothBits(DWORD &invalid)
 
 		patchData->SetFlag(EPD_BEENDONE, TRUE);
 		}
-		
+
 	nodes.DisposeTemporary();
 	return bits;
 	}
@@ -640,16 +622,16 @@ DWORD EditPatchMod::GetSelSmoothBits(DWORD &invalid)
 // ------------------------------------------------------------------------------------------------------------------------------------------------------
 
 DWORD EditPatchMod::GetUsedSmoothBits()
-	{	
+	{
 	DWORD bits = 0;
-	ModContextList mcList;	
+	ModContextList mcList;
 	INodeTab nodes;
 
 	if (!ip)
 		return 0;
 	ip->GetModContexts(mcList, nodes);
 	ClearPatchDataFlag(mcList, EPD_BEENDONE);
-	
+
 	for (int i = 0; i < mcList.Count(); i++)
 	{
 		EditPatchData *patchData =(EditPatchData*)mcList[i]->localData;
@@ -666,11 +648,11 @@ DWORD EditPatchMod::GetUsedSmoothBits()
 		for (int j = 0; j < patch->getNumPatches(); j++)
 		{
 			bits |= patch->patches[j].smGroup;
-			}		
+			}
 
 		patchData->SetFlag(EPD_BEENDONE, TRUE);
 		}
-		
+
 	nodes.DisposeTemporary();
 	return bits;
 	}
@@ -679,14 +661,14 @@ DWORD EditPatchMod::GetUsedSmoothBits()
 
 void EditPatchMod::SelectBySmoothGroup(DWORD bits, BOOL clear)
 	{
-	ModContextList mcList;	
+	ModContextList mcList;
 	INodeTab nodes;
 
 	if (!ip)
 		return;
 	ip->GetModContexts(mcList, nodes);
 	ClearPatchDataFlag(mcList, EPD_BEENDONE);
-	
+
 	theHold.Begin();
 
 	for (int i = 0; i < mcList.Count(); i++)
@@ -707,25 +689,25 @@ void EditPatchMod::SelectBySmoothGroup(DWORD bits, BOOL clear)
 		{
 			theHold.Put(new PatchSelRestore(patchData, this, patch));
 			}
-		
+
 		if (clear)
-			patch->patchSel.ClearAll();			
+			patch->patchSel.ClearAll();
 		for (int j = 0; j < patch->getNumPatches(); j++)
-		{			
+		{
 			if (patch->patches[j].smGroup & bits)
 			{
-				patch->patchSel.Set(j);			
+				patch->patchSel.Set(j);
 				}
 			}
-		
+
 		patchData->UpdateChanges(patch, rpatch, FALSE);
 		patchData->SetFlag(EPD_BEENDONE, TRUE);
 		patchData->TempData(this)->Invalidate(PART_SELECT);
 		}
-		
+
 	PatchSelChanged();
 	theHold.Accept(GetString(IDS_RB_SELECTBYSMOOTH));
-	
+
 	nodes.DisposeTemporary();
 	NotifyDependents(FOREVER, PART_SELECT, REFMSG_CHANGE);
 	ip->RedrawViews(ip->GetTime());
@@ -735,14 +717,14 @@ void EditPatchMod::SelectBySmoothGroup(DWORD bits, BOOL clear)
 
 void EditPatchMod::SetSelSmoothBits(DWORD bits, DWORD which)
 	{
-	ModContextList mcList;	
+	ModContextList mcList;
 	INodeTab nodes;
 
 	if (!ip)
 		return;
 	ip->GetModContexts(mcList, nodes);
 	ClearPatchDataFlag(mcList, EPD_BEENDONE);
-	
+
 	theHold.Begin();
 
 	for (int i = 0; i < mcList.Count(); i++)
@@ -763,24 +745,24 @@ void EditPatchMod::SetSelSmoothBits(DWORD bits, DWORD which)
 		{
 			theHold.Put(new PatchSelRestore(patchData, this, patch));
 			}
-		
+
 		for (int j = 0; j < patch->getNumPatches(); j++)
-		{			
+		{
 			if (patch->patchSel[j])
 			{
 				patch->patches[j].smGroup &= ~which;
-				patch->patches[j].smGroup |= bits&which;			
+				patch->patches[j].smGroup |= bits&which;
 				}
 			}
-		
+
 		patchData->UpdateChanges(patch, rpatch, FALSE);
 		patchData->SetFlag(EPD_BEENDONE, TRUE);
 		patchData->TempData(this)->Invalidate(PART_SELECT);
 		}
-		
+
 	PatchSelChanged();
 	theHold.Accept(GetString(IDS_RB_SETSMOOTHGROUP));
-	
+
 	nodes.DisposeTemporary();
 	NotifyDependents(FOREVER, PART_TOPO, REFMSG_CHANGE);
 	InvalidateSurfaceUI();
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_tess.cpp b/code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_tess.cpp
index 34d6b8397..de534123d 100644
--- a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_tess.cpp
+++ b/code/nel/tools/3d/plugin_max/nel_patch_edit/np_epm_tess.cpp
@@ -14,7 +14,7 @@
 #define PROMPT_TIME	2000
 
 extern AdvParams sParams;
-INT_PTR CALLBACK AdvParametersDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); 
+INT_PTR CALLBACK AdvParametersDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 // ------------------------------------------------------------------------------------------------------------------------------------------------------
 
@@ -56,7 +56,7 @@ void EditPatchMod::SetTessUI(HWND hDlg, TessApprox *tess)
 	{
 		CheckDlgButton(hDlg, IDC_TILE_MODE, TRUE);
 	}
-	else 
+	else
 	{
 		CheckDlgButton(hDlg, IDC_TILE_MODE, FALSE);
 	}
@@ -66,7 +66,7 @@ void EditPatchMod::SetTessUI(HWND hDlg, TessApprox *tess)
 	EnableWindow (GetDlgItem (hDlg, IDC_STEPSSPINNER), !bCheck);
 	EnableWindow (GetDlgItem (hDlg, IDC_STEPS_RENDER), !bCheck);
 	EnableWindow (GetDlgItem (hDlg, IDC_STEPSRENDERSPINNER), !bCheck);
-	
+
 	// New
 	EnableWindow (GetDlgItem (hDlg, IDC_TILESTEPS), bCheck);
 	EnableWindow (GetDlgItem (hDlg, IDC_TILESTEPSSPINNER), bCheck);
@@ -76,7 +76,7 @@ void EditPatchMod::SetTessUI(HWND hDlg, TessApprox *tess)
 
 	if (keepMapping)
 		CheckDlgButton(hDlg, IDC_KEEP_MAPPING, TRUE);
-	else 
+	else
 		CheckDlgButton(hDlg, IDC_KEEP_MAPPING, FALSE);
 
 	switch (tess->type)
@@ -166,13 +166,13 @@ void EditPatchMod::SetTessUI(HWND hDlg, TessApprox *tess)
 			EnableWindow(GetDlgItem(hDlg, IDC_TESS_NORMALS), !GetViewTessWeld());
 			EnableWindow(GetDlgItem(hDlg, IDC_WELDTESS), tess->merge > 0.0f);
 		}
-	} else 
+	} else
 	{
 		if (settingDisp)
 		{
 			ShowWindow(GetDlgItem(hDlg, IDC_MESH), SW_SHOW);
 			ShowWindow(GetDlgItem(hDlg, IDC_DISP), SW_SHOW);
-		} else 
+		} else
 		{
 			if (tess->type != TESS_SET)
 			{
@@ -202,7 +202,7 @@ void EditPatchMod::SetTessUI(HWND hDlg, TessApprox *tess)
 		CheckDlgButton(hDlg, IDC_TESS_RENDERER, FALSE);
 		CheckDlgButton(hDlg, IDC_TESS_NORMALS, GetViewTessNormals());
 		CheckDlgButton(hDlg, IDC_WELDTESS, GetViewTessWeld());
-	} else 
+	} else
 	{
 		CheckDlgButton(hDlg, IDC_TESS_VIEW, FALSE);
 		CheckDlgButton(hDlg, IDC_TESS_RENDERER, TRUE);
@@ -213,28 +213,28 @@ void EditPatchMod::SetTessUI(HWND hDlg, TessApprox *tess)
 }
 
 // ------------------------------------------------------------------------------------------------------------------------------------------------------
-	
+
 BOOL CALLBACK PatchObjSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 	{
 	EditPatchMod *ep =(EditPatchMod *)GetWindowLongPtr(hDlg, GWLP_USERDATA);
 	if (!ep && message != WM_INITDIALOG)
 		return FALSE;
-	
+
 	switch (message)
 	{
-		case WM_INITDIALOG: 
+		case WM_INITDIALOG:
 			{
 
 		 	ep =(EditPatchMod *)lParam;
 		 	ep->hSurfPanel = hDlg;
-			SetWindowLongPtr(hDlg, GWLP_USERDATA, (LONG_PTR)ep);		 	
+			SetWindowLongPtr(hDlg, GWLP_USERDATA, (LONG_PTR)ep);
 			if (!ep->settingViewportTess  && ep->settingDisp && ep->GetProdTess().type == TESS_SET)
 				ep->settingDisp = FALSE;
 			TessApprox t;
 			if (ep->settingViewportTess)
 			{
 				t = ep->GetViewTess();
-			} else 
+			} else
 			{
 				if (ep->settingDisp)
 					t = ep->GetDispTess();
@@ -286,14 +286,14 @@ BOOL CALLBACK PatchObjSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 				ep->mergeSpin = NULL;
 				}
 			return FALSE;
-		
-		case CC_SPINNER_BUTTONUP: 
+
+		case CC_SPINNER_BUTTONUP:
 			{
 			TessApprox tess;
 			if (ep->settingViewportTess)
 			{
 				tess = ep->GetViewTess();
-			} else 
+			} else
 			{
 				if (ep->settingDisp)
 					tess = ep->GetDispTess();
@@ -304,7 +304,7 @@ BOOL CALLBACK PatchObjSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 			}
 			break;
 
-		case CC_SPINNER_CHANGE:	
+		case CC_SPINNER_CHANGE:
 			switch (LOWORD(wParam))
 			{
 				case IDC_TESS_U_SPINNER:
@@ -318,7 +318,7 @@ BOOL CALLBACK PatchObjSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 					if (ep->settingViewportTess)
 					{
 						tess = ep->GetViewTess();
-					} else 
+					} else
 					{
 						if (ep->settingDisp)
 							tess = ep->GetDispTess();
@@ -349,7 +349,7 @@ BOOL CALLBACK PatchObjSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 					if (ep->settingViewportTess)
 					{
 						ep->SetViewTess(tess);
-					} else 
+					} else
 					{
 						if (ep->settingDisp)
 							ep->SetDispTess(tess);
@@ -363,17 +363,11 @@ BOOL CALLBACK PatchObjSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 				}
 			break;
 
-		case WM_LBUTTONDOWN:
-		case WM_LBUTTONUP:
-		case WM_MOUSEMOVE:   			
-   			ep->ip->RollupMouseMessage(hDlg, message, wParam, lParam);
-			return FALSE;		
-		
-		case WM_COMMAND:			
+		case WM_COMMAND:
 			switch (LOWORD(wParam))
-			{				
+			{
 				// Tessellation
-				case IDC_TESS_VIEW:	
+				case IDC_TESS_VIEW:
 					{
 					ep->settingViewportTess = TRUE;
 					TessApprox t = ep->GetViewTess();
@@ -381,14 +375,14 @@ BOOL CALLBACK PatchObjSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 					EnableWindow(GetDlgItem(hDlg, IDC_TESS_VIEW_DEP), FALSE); // always off here
 					break;
 					}
-				case IDC_TESS_RENDERER: 
+				case IDC_TESS_RENDERER:
 					{
 					ep->settingViewportTess = FALSE;
 					if (ep->settingDisp)
 					{
 						TessApprox t = ep->GetDispTess();
 						ep->SetTessUI(hDlg, &t);
-					} else 
+					} else
 					{
 						TessApprox t = ep->GetProdTess();
 						ep->SetTessUI(hDlg, &t);
@@ -407,13 +401,13 @@ BOOL CALLBACK PatchObjSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 					{
 						BOOL bCheck=(IsDlgButtonChecked(hDlg, IDC_TILE_MODE)==BST_CHECKED);
 						ep->SetTileMode (bCheck!=0);
-						
+
 						// Old
 						EnableWindow (GetDlgItem (hDlg, IDC_STEPS), !bCheck);
 						EnableWindow (GetDlgItem (hDlg, IDC_STEPSSPINNER), !bCheck);
 						EnableWindow (GetDlgItem (hDlg, IDC_STEPS_RENDER), !bCheck);
 						EnableWindow (GetDlgItem (hDlg, IDC_STEPSRENDERSPINNER), !bCheck);
-						
+
 						// New
 						EnableWindow (GetDlgItem (hDlg, IDC_TILESTEPS), bCheck);
 						EnableWindow (GetDlgItem (hDlg, IDC_TILESTEPSSPINNER), bCheck);
@@ -441,7 +435,7 @@ BOOL CALLBACK PatchObjSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 					if (ep->settingViewportTess)
 					{
 						tess = ep->GetViewTess();
-					} else 
+					} else
 					{
 						if (ep->settingDisp)
 							tess = ep->GetDispTess();
@@ -482,7 +476,7 @@ BOOL CALLBACK PatchObjSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 					if (ep->settingViewportTess)
 					{
 						ep->SetViewTess(tess);
-					} else 
+					} else
 					{
 						if (ep->settingDisp)
 							ep->SetDispTess(tess);
@@ -492,7 +486,7 @@ BOOL CALLBACK PatchObjSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 					ep->SetTessUI(hDlg, &tess);
 					}
 					break;
-				case IDC_TESS_VIEW_DEP: 
+				case IDC_TESS_VIEW_DEP:
 					{
 					TessApprox tess;
 					tess = ep->GetProdTess();
@@ -508,7 +502,7 @@ BOOL CALLBACK PatchObjSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 					{
 						ep->SetViewTessNormals(IsDlgButtonChecked(hDlg, IDC_TESS_NORMALS));
 						ep->SetTessUI(hDlg, &ep->GetViewTess());
-					} else 
+					} else
 					{
 						ep->SetProdTessNormals(IsDlgButtonChecked(hDlg, IDC_TESS_NORMALS));
 						if (ep->settingDisp)
@@ -522,7 +516,7 @@ BOOL CALLBACK PatchObjSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 					{
 						ep->SetViewTessWeld(IsDlgButtonChecked(hDlg, IDC_WELDTESS));
 						ep->SetTessUI(hDlg, &ep->GetViewTess());
-					} else 
+					} else
 					{
 						ep->SetProdTessWeld(IsDlgButtonChecked(hDlg, IDC_WELDTESS));
 						if (ep->settingDisp)
@@ -531,13 +525,13 @@ BOOL CALLBACK PatchObjSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 							ep->SetTessUI(hDlg, &ep->GetProdTess());
 					}
 					break;
-				case IDC_ADVANCED_PARAMETERS: 
+				case IDC_ADVANCED_PARAMETERS:
 					{
 					TessApprox tess;
 					if (ep->settingViewportTess)
 					{
 						tess = ep->GetViewTess();
-					} else 
+					} else
 					{
 						if (ep->settingDisp)
 							tess = ep->GetDispTess();
@@ -563,7 +557,7 @@ BOOL CALLBACK PatchObjSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 							if (MessageBox(hDlg, warning, title,
 								MB_YESNO | MB_ICONWARNING | MB_DEFBUTTON2) == IDYES)
 								confirm = TRUE;
- 
+
 						} else
 							confirm = TRUE;
 						if (confirm)
@@ -576,7 +570,7 @@ BOOL CALLBACK PatchObjSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 							if (ep->settingViewportTess)
 							{
 								ep->SetViewTess(tess);
-							} else 
+							} else
 							{
 								if (ep->settingDisp)
 									ep->SetDispTess(tess);
@@ -590,8 +584,8 @@ BOOL CALLBACK PatchObjSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 				}
 			break;
 		}
-	
-	return FALSE;
+
+		return FALSE;
 	}
 
 // ------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -608,7 +602,7 @@ AdvParametersDialogProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     switch (uMsg)
 	{
-    case WM_INITDIALOG: 
+    case WM_INITDIALOG:
 		{
 		initing = TRUE;
         CenterWindow(hDlg, GetCOREInterface()->GetMAXHWnd());
@@ -634,7 +628,7 @@ AdvParametersDialogProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 			CheckDlgButton(hDlg, IDC_DELAUNAY, TRUE);
 			break;
 		}
-		break; 
+		break;
 		}
 
     case WM_COMMAND:
@@ -712,27 +706,27 @@ AdvParametersDialogProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 
 // ------------------------------------------------------------------------------------------------------------------------------------------------------
 
-void EditPatchMod::SetViewTess(TessApprox &tess) 
+void EditPatchMod::SetViewTess(TessApprox &tess)
 {
 	viewTess = tess;
 	ModContextList mcList;
 	INodeTab nodes;
-	
+
 	if (!ip)
-		return;	
-	
+		return;
+
 	ip->GetModContexts(mcList, nodes);
-	
+
 	for (int i = 0; i < mcList.Count(); i++)
 	{
 		EditPatchData *patchData =(EditPatchData*)mcList[i]->localData;
 		if (!patchData)
-			continue;		
+			continue;
 		RPatchMesh *rpatch;
 		PatchMesh *patch = patchData->TempData(this)->GetPatch(ip->GetTime(),rpatch);
 		if (!patch)
 			continue;
-		
+
 		patch->SetViewTess(tess);
 		patchData->viewTess = tess;
 		//rpatch->rTess = rTess;
@@ -748,27 +742,27 @@ void EditPatchMod::SetViewTess(TessApprox &tess)
 
 // ------------------------------------------------------------------------------------------------------------------------------------------------------
 
-void EditPatchMod::SetProdTess(TessApprox &tess) 
+void EditPatchMod::SetProdTess(TessApprox &tess)
 {
 	prodTess = tess;
 	ModContextList mcList;
 	INodeTab nodes;
-	
+
 	if (!ip)
-		return;	
-	
+		return;
+
 	ip->GetModContexts(mcList, nodes);
-	
+
 	for (int i = 0; i < mcList.Count(); i++)
 	{
 		EditPatchData *patchData =(EditPatchData*)mcList[i]->localData;
 		if (!patchData)
-			continue;		
+			continue;
 		RPatchMesh *rpatch;
 		PatchMesh *patch = patchData->TempData(this)->GetPatch(ip->GetTime(),rpatch);
 		if (!patch)
 			continue;
-		
+
 		patch->SetProdTess(tess);
 		patchData->prodTess = tess;
 		if (patchData->tempData)
@@ -783,27 +777,27 @@ void EditPatchMod::SetProdTess(TessApprox &tess)
 
 // ------------------------------------------------------------------------------------------------------------------------------------------------------
 
-void EditPatchMod::SetDispTess(TessApprox &tess) 
+void EditPatchMod::SetDispTess(TessApprox &tess)
 {
 	dispTess = tess;
 	ModContextList mcList;
 	INodeTab nodes;
-	
+
 	if (!ip)
-		return;	
-	
+		return;
+
 	ip->GetModContexts(mcList, nodes);
-	
+
 	for (int i = 0; i < mcList.Count(); i++)
 	{
 		EditPatchData *patchData =(EditPatchData*)mcList[i]->localData;
 		if (!patchData)
-			continue;		
+			continue;
 		RPatchMesh *rpatch;
 		PatchMesh *patch = patchData->TempData(this)->GetPatch(ip->GetTime(),rpatch);
 		if (!patch)
 			continue;
-		
+
 		patch->SetDispTess(tess);
 		patchData->dispTess = tess;
 		if (patchData->tempData)
@@ -818,27 +812,27 @@ void EditPatchMod::SetDispTess(TessApprox &tess)
 
 // ------------------------------------------------------------------------------------------------------------------------------------------------------
 
-void EditPatchMod::SetViewTessNormals(BOOL use) 
+void EditPatchMod::SetViewTessNormals(BOOL use)
 {
 	mViewTessNormals = use;
 	ModContextList mcList;
 	INodeTab nodes;
-	
+
 	if (!ip)
-		return;	
-	
+		return;
+
 	ip->GetModContexts(mcList, nodes);
-	
+
 	for (int i = 0; i < mcList.Count(); i++)
 	{
 		EditPatchData *patchData =(EditPatchData*)mcList[i]->localData;
 		if (!patchData)
-			continue;		
+			continue;
 		RPatchMesh *rpatch;
 		PatchMesh *patch = patchData->TempData(this)->GetPatch(ip->GetTime(),rpatch);
 		if (!patch)
 			continue;
-		
+
 		patch->SetViewTessNormals(use);
 		patchData->mViewTessNormals = use;
 		if (patchData->tempData)
@@ -853,27 +847,27 @@ void EditPatchMod::SetViewTessNormals(BOOL use)
 
 // ------------------------------------------------------------------------------------------------------------------------------------------------------
 
-void EditPatchMod::SetProdTessNormals(BOOL use) 
+void EditPatchMod::SetProdTessNormals(BOOL use)
 {
 	mProdTessNormals = use;
 	ModContextList mcList;
 	INodeTab nodes;
-	
+
 	if (!ip)
-		return;	
-	
+		return;
+
 	ip->GetModContexts(mcList, nodes);
-	
+
 	for (int i = 0; i < mcList.Count(); i++)
 	{
 		EditPatchData *patchData =(EditPatchData*)mcList[i]->localData;
 		if (!patchData)
-			continue;		
+			continue;
 		RPatchMesh *rpatch;
 		PatchMesh *patch = patchData->TempData(this)->GetPatch(ip->GetTime(),rpatch);
 		if (!patch)
 			continue;
-		
+
 		patch->SetProdTessNormals(use);
 		patchData->mProdTessNormals = use;
 		if (patchData->tempData)
@@ -888,27 +882,27 @@ void EditPatchMod::SetProdTessNormals(BOOL use)
 
 // ------------------------------------------------------------------------------------------------------------------------------------------------------
 
-void EditPatchMod::SetViewTessWeld(BOOL weld) 
+void EditPatchMod::SetViewTessWeld(BOOL weld)
 {
 	mViewTessWeld = weld;
 	ModContextList mcList;
 	INodeTab nodes;
-	
+
 	if (!ip)
-		return;	
-	
+		return;
+
 	ip->GetModContexts(mcList, nodes);
-	
+
 	for (int i = 0; i < mcList.Count(); i++)
 	{
 		EditPatchData *patchData =(EditPatchData*)mcList[i]->localData;
 		if (!patchData)
-			continue;		
+			continue;
 		RPatchMesh *rpatch;
 		PatchMesh *patch = patchData->TempData(this)->GetPatch(ip->GetTime(),rpatch);
 		if (!patch)
 			continue;
-		
+
 		patch->SetViewTessWeld(weld);
 		patchData->mViewTessWeld = weld;
 		if (patchData->tempData)
@@ -923,27 +917,27 @@ void EditPatchMod::SetViewTessWeld(BOOL weld)
 
 // ------------------------------------------------------------------------------------------------------------------------------------------------------
 
-void EditPatchMod::SetProdTessWeld(BOOL weld) 
+void EditPatchMod::SetProdTessWeld(BOOL weld)
 {
 	mProdTessWeld = weld;
 	ModContextList mcList;
 	INodeTab nodes;
-	
+
 	if (!ip)
-		return;	
-	
+		return;
+
 	ip->GetModContexts(mcList, nodes);
-	
+
 	for (int i = 0; i < mcList.Count(); i++)
 	{
 		EditPatchData *patchData =(EditPatchData*)mcList[i]->localData;
 		if (!patchData)
-			continue;		
+			continue;
 		RPatchMesh *rpatch;
 		PatchMesh *patch = patchData->TempData(this)->GetPatch(ip->GetTime(),rpatch);
 		if (!patch)
 			continue;
-		
+
 		patch->SetProdTessWeld(weld);
 		patchData->mProdTessWeld = weld;
 		if (patchData->tempData)
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_mods.cpp b/code/nel/tools/3d/plugin_max/nel_patch_edit/np_mods.cpp
index bb134c871..ec109d320 100644
--- a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_mods.cpp
+++ b/code/nel/tools/3d/plugin_max/nel_patch_edit/np_mods.cpp
@@ -26,7 +26,7 @@ int controlsInit = FALSE;
 using namespace NLMISC;
 
 /** public functions **/
-BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved) 
+BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved)
 {
 	// initialize nel context
 	if (!NLMISC::INelContext::isContextInitialised())
@@ -40,11 +40,11 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved)
 	{
 		hInstance = hinstDLL;
 		DisableThreadLibraryCalls(hInstance);
-		
-		if (!controlsInit) 
+
+		if (!controlsInit)
 		{
 			controlsInit = TRUE;
-			
+
 			// jaguar controls
 #if MAX_VERSION_MAJOR < 14
 			InitCustomControls(hInstance);
@@ -55,12 +55,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved)
 			Ctl3dRegister(hinstDLL);
 			Ctl3dAutoSubclass(hinstDLL);
 #endif
-			
+
 			// initialize Chicago controls
 			InitCommonControls();
 		}
 	}
-	
+
 	return TRUE;
 }
 
@@ -68,20 +68,20 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved)
 //------------------------------------------------------
 // This is the interface to Jaguar:
 //------------------------------------------------------
-__declspec( dllexport ) const TCHAR *LibDescription() 
-{ 
+__declspec( dllexport ) const TCHAR *LibDescription()
+{
 	return _T("NeL Patch Edit");
 }
 
 /// MUST CHANGE THIS NUMBER WHEN ADD NEW CLASS
 __declspec( dllexport ) int LibNumberClasses()
-{ 
+{
 	return 1;
 }
 
-__declspec( dllexport ) ClassDesc *LibClassDesc(int i) 
+__declspec( dllexport ) ClassDesc *LibClassDesc(int i)
 {
-	switch(i) 
+	switch(i)
 	{
 		case 0: return GetEditPatchModDesc();
 		default: return NULL;
@@ -90,7 +90,7 @@ __declspec( dllexport ) ClassDesc *LibClassDesc(int i)
 
 // Return version so can detect obsolete DLLs
 __declspec( dllexport ) ULONG LibVersion()
-{ 
+{
 	return VERSION_3DSMAX;
 }
 
@@ -110,12 +110,6 @@ BOOL CALLBACK DefaultSOTProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
 			SetWindowLongPtr(hWnd,GWLP_USERDATA,lParam);
 			break;
 
-		case WM_LBUTTONDOWN:
-		case WM_LBUTTONUP:
-		case WM_MOUSEMOVE:
-			if (ip) ip->RollupMouseMessage(hWnd,msg,wParam,lParam);
-			return FALSE;
-
 		default:
 			return FALSE;
 	}
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_rollup.cpp b/code/nel/tools/3d/plugin_max/nel_patch_edit/np_rollup.cpp
index ede7215f9..baf340ae2 100644
--- a/code/nel/tools/3d/plugin_max/nel_patch_edit/np_rollup.cpp
+++ b/code/nel/tools/3d/plugin_max/nel_patch_edit/np_rollup.cpp
@@ -22,7 +22,7 @@ BOOL filterVerts = TRUE;
 static BOOL filterVecs = TRUE;
 
 
-static void SetVertFilter() 
+static void SetVertFilter()
 {
 	patchHitLevel[EP_VERTEX] =(filterVerts ? SUBHIT_PATCH_VERTS : 0) |(filterVecs ? SUBHIT_PATCH_VECS : 0);
 }
@@ -40,10 +40,10 @@ INT_PTR CALLBACK PatchSelectDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPAR
 	ICustToolbar *iToolbar;
 	if (!ep && message != WM_INITDIALOG)
 		return FALSE;
-	
+
 	switch (message)
 	{
-		case WM_INITDIALOG: 
+		case WM_INITDIALOG:
 		{
 			// Get the module path
 			HMODULE hModule = hInstance;
@@ -75,9 +75,9 @@ INT_PTR CALLBACK PatchSelectDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPAR
  									// Setup version number
 									TCHAR version[512];
 									_stprintf(version, _T("Version %d.%d.%d.%d"),
-										info->dwFileVersionMS>>16, 
-										info->dwFileVersionMS&0xffff, 
-										info->dwFileVersionLS>>16,  
+										info->dwFileVersionMS>>16,
+										info->dwFileVersionMS&0xffff,
+										info->dwFileVersionLS>>16,
 										info->dwFileVersionLS&0xffff);
 									SetWindowText (GetDlgItem (hDlg, IDC_VERSION), version);
 								}
@@ -104,7 +104,7 @@ INT_PTR CALLBACK PatchSelectDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPAR
 
 		 	ep =(EditPatchMod *)lParam;
 		 	ep->hSelectPanel = hDlg;
-			SetWindowLongPtr(hDlg, GWLP_USERDATA, (LONG_PTR)ep);		 	
+			SetWindowLongPtr(hDlg, GWLP_USERDATA, (LONG_PTR)ep);
 			// Set up the editing level selector
 			LoadImages();
 			iToolbar = GetICustToolbar(GetDlgItem(hDlg, IDC_SELTYPE));
@@ -132,18 +132,12 @@ INT_PTR CALLBACK PatchSelectDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPAR
 			ep->ip->ClearPickMode();
 			CancelEditPatchModes(ep->ip);
 			return FALSE;
-		
-		case WM_LBUTTONDOWN:
-		case WM_LBUTTONUP:
-		case WM_MOUSEMOVE:   			
-   			ep->ip->RollupMouseMessage(hDlg, message, wParam, lParam);
-			return FALSE;		
-		
-		case WM_COMMAND: 
+
+		case WM_COMMAND:
 			{
 			BOOL needRedraw = FALSE;
 			switch (LOWORD(wParam))
-			{				
+			{
 				case EP_VERTEX:
 					if (ep->GetSubobjectLevel() == EP_VERTEX)
 						ep->ip->SetSubObjectLevel(PO_OBJECT);
@@ -211,7 +205,7 @@ INT_PTR CALLBACK PatchSelectDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPAR
 			if (((LPNMHDR)lParam)->code == TTN_NEEDTEXT)
 			{
 				LPTOOLTIPTEXT lpttt;
-				lpttt =(LPTOOLTIPTEXT)lParam;				
+				lpttt =(LPTOOLTIPTEXT)lParam;
 				switch (lpttt->hdr.idFrom)
 				{
 				case EP_VERTEX:
@@ -231,19 +225,19 @@ INT_PTR CALLBACK PatchSelectDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPAR
 			break;
 
 		}
-	
+
 	return FALSE;
 }
 
 // ------------------------------------------------------------------------------------------------------------------------------------------------------
 
-void EditPatchMod::SetOpsDlgEnables() 
+void EditPatchMod::SetOpsDlgEnables()
 {
 	if (!hOpsPanel)
 		return;
-	
+
 	nlassert(ip);
-	
+
 	// Disconnect right-click and delete mechanisms
 	ip->GetRightClickMenuManager()->Unregister(&pMenu);
 	ip->UnRegisterDeleteUser(&pDel);
@@ -339,7 +333,7 @@ void EditPatchMod::SetOpsDlgEnables()
 
 	// Enable/disable right-click and delete mechanisms
 	if (!oType)
-	{			
+	{
 		pMenu.SetMod(this);
 		ip->GetRightClickMenuManager()->Register(&pMenu);
 		pDel.SetMod(this);
@@ -355,19 +349,19 @@ INT_PTR CALLBACK PatchOpsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 	if (!ep && message != WM_INITDIALOG)
 		return FALSE;
 
-	
+
 	ISpinnerControl *spin;
 	ICustButton *ebut;
 
 	switch (message)
 	{
-		case WM_INITDIALOG: 
+		case WM_INITDIALOG:
 			{
 		 	ep =(EditPatchMod *)lParam;
 		 	ep->hOpsPanel = hDlg;
 			for (int i = IDC_SMOOTH_GRP1; i < IDC_SMOOTH_GRP1 + 32; i++)
 				SendMessage(GetDlgItem(hDlg, i), CC_COMMAND, CC_CMD_SET_TYPE, CBT_CHECK);
-			SetWindowLongPtr(hDlg, GWLP_USERDATA, (LONG_PTR)ep);		 	
+			SetWindowLongPtr(hDlg, GWLP_USERDATA, (LONG_PTR)ep);
 			ICustButton *but = GetICustButton(GetDlgItem(hDlg, IDC_ATTACH));
 			but->SetHighlightColor(GREEN_WASH);
 			but->SetType(CBT_CHECK);
@@ -407,12 +401,12 @@ INT_PTR CALLBACK PatchOpsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 			EnableWindow (GetDlgItem (hDlg, IDC_STEPSSPINNER), !IsDlgButtonChecked(hDlg, IDC_TILE_MODE));
 			EnableWindow (GetDlgItem (hDlg, IDC_STEPS_RENDER), !IsDlgButtonChecked(hDlg, IDC_TILE_MODE));
 			EnableWindow (GetDlgItem (hDlg, IDC_STEPSRENDERSPINNER), !IsDlgButtonChecked(hDlg, IDC_TILE_MODE));
-			
+
 			// New
 			EnableWindow (GetDlgItem (hDlg, IDC_TILESTEPS), IsDlgButtonChecked(hDlg, IDC_TILE_MODE));
 			EnableWindow (GetDlgItem (hDlg, IDC_TILESTEPSSPINNER), IsDlgButtonChecked(hDlg, IDC_TILE_MODE));
 			EnableWindow (GetDlgItem (hDlg, IDC_KEEP_MAPPING), IsDlgButtonChecked(hDlg, IDC_TILE_MODE));
-			
+
 			// New
 			EnableWindow (GetDlgItem (hDlg, IDC_TRANSITION), IsDlgButtonChecked(hDlg, IDC_TILE_MODE));
 			EnableWindow (GetDlgItem (hDlg, IDC_TRANSITIONSPINNER), IsDlgButtonChecked(hDlg, IDC_TILE_MODE));
@@ -500,7 +494,7 @@ INT_PTR CALLBACK PatchOpsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 			ep->ip->UnRegisterDeleteUser(&pDel);
 			ep->ip->GetRightClickMenuManager()->Unregister(&pMenu);
 			return FALSE;
-		
+
 		case CC_SPINNER_CHANGE:
 			switch (LOWORD(wParam))
 			{
@@ -550,7 +544,7 @@ INT_PTR CALLBACK PatchOpsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 							}
 
 						ep->ip->RedrawViews(ep->ip->GetTime(), REDRAW_END);
-						} else 
+						} else
 					{
 						ep->ip->RedrawViews(ep->ip->GetTime(), REDRAW_INTERACTIVE);
 						}
@@ -568,18 +562,18 @@ INT_PTR CALLBACK PatchOpsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 					int sm =0;
 					int sm2 = 0;
 					if (IsDlgButtonChecked(hDlg, IDC_EP_SM_SMOOTH))
-						sm = 0;					
+						sm = 0;
 					else if (IsDlgButtonChecked(hDlg, IDC_EP_SM_SMOOTH2))
-						sm = 1;					
+						sm = 1;
 					else if (IsDlgButtonChecked(hDlg, IDC_EP_SM_SMOOTH3))
-						sm = 2;					
+						sm = 2;
 
 					if (IsDlgButtonChecked(hDlg, IDC_EP_SM_SMOOTH4))
-						sm2 = 0;					
+						sm2 = 0;
 					else if (IsDlgButtonChecked(hDlg, IDC_EP_SM_SMOOTH5))
-						sm2 = 1;					
+						sm2 = 1;
 					else if (IsDlgButtonChecked(hDlg, IDC_EP_SM_SMOOTH6))
-						sm2 = 2;					
+						sm2 = 2;
 
 					spin = GetISpinner(GetDlgItem(hDlg, IDC_EP_OUTLINESPINNER));
 					ep->Bevel(ep->ip->GetTime(), spin->GetFVal(), sm, sm2);
@@ -594,7 +588,7 @@ INT_PTR CALLBACK PatchOpsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 							}
 
 						ep->ip->RedrawViews(ep->ip->GetTime(), REDRAW_END);
-						} else 
+						} else
 					{
 						ep->ip->RedrawViews(ep->ip->GetTime(), REDRAW_INTERACTIVE);
 						}
@@ -645,15 +639,9 @@ INT_PTR CALLBACK PatchOpsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 				}
 			break;
 
-		case WM_LBUTTONDOWN:
-		case WM_LBUTTONUP:
-		case WM_MOUSEMOVE:   			
-   			ep->ip->RollupMouseMessage(hDlg, message, wParam, lParam);
-			return FALSE;		
-		
-		case WM_COMMAND:			
+		case WM_COMMAND:
 			switch (LOWORD(wParam))
-			{				
+			{
 				// Subdivision
 // watje 3-18-99
 				case IDC_SHOW_INTERIOR_FACES:
@@ -666,18 +654,18 @@ INT_PTR CALLBACK PatchOpsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 					{
 						BOOL bCheck=(IsDlgButtonChecked(hDlg, IDC_TILE_MODE)==BST_CHECKED);
 						ep->SetTileMode (bCheck!=0);
-						
+
 						// Old
 						EnableWindow (GetDlgItem (hDlg, IDC_STEPS), !bCheck);
 						EnableWindow (GetDlgItem (hDlg, IDC_STEPSSPINNER), !bCheck);
 						EnableWindow (GetDlgItem (hDlg, IDC_STEPS_RENDER), !bCheck);
 						EnableWindow (GetDlgItem (hDlg, IDC_STEPSRENDERSPINNER), !bCheck);
-						
+
 						// New
 						EnableWindow (GetDlgItem (hDlg, IDC_TILESTEPS), bCheck);
 						EnableWindow (GetDlgItem (hDlg, IDC_TILESTEPSSPINNER), bCheck);
 						EnableWindow (GetDlgItem (hDlg, IDC_KEEP_MAPPING), bCheck);
-						
+
 						// New
 						EnableWindow (GetDlgItem (hDlg, IDC_TRANSITION), bCheck);
 						EnableWindow (GetDlgItem (hDlg, IDC_TRANSITIONSPINNER), bCheck);
@@ -743,7 +731,7 @@ INT_PTR CALLBACK PatchOpsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 						ep->ip->SetStdCommandMode(CID_OBJMOVE);
 					else ep->ip->SetCommandMode(ep->bevelMode);
 					break;
-				
+
 				case IDC_TURN:
 					nlassert (ep->GetSubobjectLevel()==PO_PATCH);
 					ep->DoPatchTurn(true);
@@ -784,7 +772,7 @@ INT_PTR CALLBACK PatchOpsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 				case IDC_DETACHREORIENT:
 					patchDetachReorient = IsDlgButtonChecked(hDlg, IDC_DETACHREORIENT);
 					break;
-				case IDC_ATTACH: 
+				case IDC_ATTACH:
 					{
 					ModContextList mcList;
 					INodeTab nodes;
@@ -810,7 +798,7 @@ INT_PTR CALLBACK PatchOpsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 				}
 			break;
 		}
-	
+
 	return FALSE;
 }
 
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/DllEntry.cpp b/code/nel/tools/3d/plugin_max/nel_patch_paint/DllEntry.cpp
index 8abb9b531..a720a5911 100644
--- a/code/nel/tools/3d/plugin_max/nel_patch_paint/DllEntry.cpp
+++ b/code/nel/tools/3d/plugin_max/nel_patch_paint/DllEntry.cpp
@@ -16,7 +16,7 @@ using namespace NLMISC;
 #endif
 
 /** public functions **/
-BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved) 
+BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved)
 {
 	// initialize nel context
 	if (!NLMISC::INelContext::isContextInitialised())
@@ -25,13 +25,13 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved)
 		nldebug("NeL Patch Paint: DllMain");
 		NLMISC::CSheetId::initWithoutSheet();
 	}
-			
+
 	hInstance = hinstDLL;
 
-	if ( !controlsInit ) 
+	if ( !controlsInit )
 	{
 		controlsInit = TRUE;
-		
+
 		// jaguar controls
 #if MAX_VERSION_MAJOR < 14
 		InitCustomControls(hInstance);
@@ -42,7 +42,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved)
 		Ctl3dRegister(hinstDLL);
 		Ctl3dAutoSubclass(hinstDLL);
 #endif
-		
+
 		// initialize Chicago controls
 		InitCommonControls();
 		}
@@ -66,8 +66,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved)
 //------------------------------------------------------
 
 __declspec( dllexport ) const TCHAR *
-LibDescription() 
-{ 
+LibDescription()
+{
 	return _T("NeL patch painter");
 }
 
@@ -109,7 +109,7 @@ LibClassDesc(int i) {
 
 
 // Return version so can detect obsolete DLLs
-__declspec( dllexport ) ULONG 
+__declspec( dllexport ) ULONG
 LibVersion() { return VERSION_3DSMAX; }
 
 // Let the plug-in register itself for deferred loading
@@ -128,12 +128,6 @@ BOOL CALLBACK DefaultSOTProc(
 			SetWindowLongPtr(hWnd,GWLP_USERDATA,lParam);
 			break;
 
-		case WM_LBUTTONDOWN:
-		case WM_LBUTTONUP:
-		case WM_MOUSEMOVE:
-			if (ip) ip->RollupMouseMessage(hWnd,msg,wParam,lParam);
-			return FALSE;
-
 		default:
 			return FALSE;
 		}
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint.cpp b/code/nel/tools/3d/plugin_max/nel_patch_paint/paint.cpp
index f89604dc3..98bc67305 100644
--- a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint.cpp
+++ b/code/nel/tools/3d/plugin_max/nel_patch_paint/paint.cpp
@@ -153,7 +153,7 @@ void drawVertexColorBox (float x0, float y0, float x1, float y1, CRGBA color, fl
 {
 	// Draw a white frame behind
 	CDRU::drawQuad (x0, y0, x1, y1, driver, CRGBA (0x40, 0x40, 0x40), CViewport());
-			
+
 	// Compute the colors with alpha to show the hardness
 	CRGBA fullFull=color;
 	CRGBA full=color;
@@ -222,9 +222,9 @@ void drawInterface (TModeMouse select, TModePaint mode, PaintPatchMod *pobj, IDr
 						CDRU::drawBitmap ( (float)(t%MOD_WIDTH)/(float)MOD_WIDTH, (float)(t/MOD_WIDTH)/(float)MOD_HEIGHT, 1.f/(float)MOD_WIDTH,
 							1.f/(float)MOD_HEIGHT, *texture, driver, CViewport(), false);
 					else
-						CDRU::drawQuad ( (float)(t%MOD_WIDTH)/(float)MOD_WIDTH, (float)(t/MOD_WIDTH)/(float)MOD_HEIGHT, 
+						CDRU::drawQuad ( (float)(t%MOD_WIDTH)/(float)MOD_WIDTH, (float)(t/MOD_WIDTH)/(float)MOD_HEIGHT,
 							(float)(t%MOD_WIDTH)/(float)MOD_WIDTH+1.f/(float)MOD_WIDTH,
-							(float)(t/MOD_WIDTH)/(float)MOD_HEIGHT+1.f/(float)MOD_HEIGHT, driver, 
+							(float)(t/MOD_WIDTH)/(float)MOD_HEIGHT+1.f/(float)MOD_HEIGHT, driver,
 							CRGBA (128, 128, 128), CViewport());
 				}
 			}
@@ -394,7 +394,7 @@ void drawInterface (TModeMouse select, TModePaint mode, PaintPatchMod *pobj, IDr
 		if ((pobj->CurrentTileSet!=-1)&&(mode==ModeTile))
 		{
 			// *** Draw the current group
-			ITexture* group[NL3D_CTILE_NUM_GROUP+1]={bankCont->allBitmap, bankCont->_0Bitmap, bankCont->_1Bitmap, bankCont->_2Bitmap, bankCont->_3Bitmap, 
+			ITexture* group[NL3D_CTILE_NUM_GROUP+1]={bankCont->allBitmap, bankCont->_0Bitmap, bankCont->_1Bitmap, bankCont->_2Bitmap, bankCont->_3Bitmap,
 								bankCont->_4Bitmap, bankCont->_5Bitmap, bankCont->_6Bitmap, bankCont->_7Bitmap, bankCont->_8Bitmap, bankCont->_9Bitmap,
 								bankCont->_10Bitmap, bankCont->_11Bitmap};
 
@@ -450,7 +450,7 @@ void makeVectMesh (std::vector<EPM_Mesh>& vectMesh, INodeTab& nodes, ModContextL
 
 	for (int i = 0; i < mcList.Count (); i++)
 	{
-		// 
+		//
 		PaintPatchData *patchData = (PaintPatchData*)mcList[i]->localData;
 		if (!patchData)
 			continue;
@@ -496,7 +496,7 @@ void transformDesc (tileDesc &desc, bool symmetry, uint rotate, uint mesh, uint
 		CTileBank::TTileType type;
 		bank.getTileXRef (tile, tileSet, number, type);
 
-		// Transform the transfo		
+		// Transform the transfo
 		CPatchInfo::getTileSymmetryRotate (bank, desc.getLayer(0).Tile, tileSymmetry, tileRotate);
 
 		// Get the state of the layer 0
@@ -579,7 +579,7 @@ void transformInvDesc (tileDesc &desc, bool symmetry, uint rotate, uint mesh, ui
 	transformDesc (desc, symmetry, 0, mesh, tile, vectMesh);
 }
 
-void EPM_PaintMouseProc::SetTile (int mesh, int tile, const tileDesc& desc, std::vector<EPM_Mesh>& vectMesh, CLandscape* land, 
+void EPM_PaintMouseProc::SetTile (int mesh, int tile, const tileDesc& desc, std::vector<EPM_Mesh>& vectMesh, CLandscape* land,
 								  CNelPatchChanger& nelPatchChg, std::vector<CBackupValue>* backupStack, bool undo, bool updateDisplace)
 {
 	// Undo: get old value
@@ -600,7 +600,7 @@ void EPM_PaintMouseProc::SetTile (int mesh, int tile, const tileDesc& desc, std:
 		maxDesc.setDisplace (oldDesc.getDisplace());
 	}
 
-	// Transform tile 
+	// Transform tile
 	tileDesc copyDesc=maxDesc;
 	transformInvDesc (maxDesc, vectMesh[mesh].Symmetry, 4-vectMesh[mesh].Rotate, mesh, tile, vectMesh);
 	transformInvDesc (copyDesc, vectMesh[mesh].Symmetry, 0, mesh, tile, vectMesh);
@@ -805,7 +805,7 @@ bool EPM_PaintMouseProc::isLocked256 (PaintPatchMod *pobj, EPM_PaintTile* pTile)
 	return false;
 }
 
-bool EPM_PaintMouseProc::ClearATile ( EPM_PaintTile* pTile, std::vector<EPM_Mesh>& vectMesh, 
+bool EPM_PaintMouseProc::ClearATile ( EPM_PaintTile* pTile, std::vector<EPM_Mesh>& vectMesh,
 								   CLandscape* land, CNelPatchChanger& nelPatchChg, bool _256, bool _force128)
 {
 	// ** 1) Backup of the tile
@@ -864,7 +864,7 @@ bool EPM_PaintMouseProc::ClearATile ( EPM_PaintTile* pTile, std::vector<EPM_Mesh
 		// Check locked
 		if (isLocked (pobj, pTile))
 			return false;
-		
+
 		// Cleared descriptor
 		tileDesc desc;
 		desc.setTile (0, 0, 0, tileIndex (0,0), tileIndex (0,0), tileIndex (0,0));
@@ -882,8 +882,8 @@ bool EPM_PaintMouseProc::ClearATile ( EPM_PaintTile* pTile, std::vector<EPM_Mesh
 	return true;
 }
 
-bool EPM_PaintMouseProc::PutATile ( EPM_PaintTile* pTile, int tileSet, int curRotation, const CTileBank& bank, 
-								   bool selectCycle, std::set<EPM_PaintTile*>& visited, std::vector<EPM_Mesh>& vectMesh, 
+bool EPM_PaintMouseProc::PutATile ( EPM_PaintTile* pTile, int tileSet, int curRotation, const CTileBank& bank,
+								   bool selectCycle, std::set<EPM_PaintTile*>& visited, std::vector<EPM_Mesh>& vectMesh,
 								   CLandscape* land, CNelPatchChanger& nelPatchChg, bool _256)
 {
 	// If tile 256, must have delta pos aligned on 2x2
@@ -912,7 +912,7 @@ bool EPM_PaintMouseProc::PutATile ( EPM_PaintTile* pTile, int tileSet, int curRo
 	int patch=pTile->tile/NUM_TILE_SEL;
 
 	// Check if we are in patch subobject and if this patch is selected
-	
+
 	if ((vectMesh[pTile->Mesh].PMesh->selLevel==EP_PATCH)&&(!vectMesh[pTile->Mesh].PMesh->patchSel[patch]))
 		return false;
 
@@ -986,7 +986,7 @@ bool EPM_PaintMouseProc::PutATile ( EPM_PaintTile* pTile, int tileSet, int curRo
 			desc.setTile (1, 1+((-curRotation-1)&3), 0, tileIndex (nTile, (curRotation-nRot)&3), tileIndex (0,0), tileIndex (0,0));
 			nlassert (other);
 			SetTile (other->Mesh, other->tile, desc, vectMesh, land, nelPatchChg, &backupStack);
-			
+
 			// Add to visited tile set
 			visited.insert (other);
 
@@ -995,7 +995,7 @@ bool EPM_PaintMouseProc::PutATile ( EPM_PaintTile* pTile, int tileSet, int curRo
 			desc.setTile (1, 1+((-curRotation+1)&3), 0, tileIndex (nTile, (curRotation-nRot)&3), tileIndex (0,0), tileIndex (0,0));
 			nlassert (other);
 			SetTile (other->Mesh, other->tile, desc, vectMesh, land, nelPatchChg, &backupStack);
-			
+
 			// Add to visited tile set
 			visited.insert (other);
 
@@ -1005,7 +1005,7 @@ bool EPM_PaintMouseProc::PutATile ( EPM_PaintTile* pTile, int tileSet, int curRo
 			nlassert (other);
 			nlassert (other==pTile->getBottomRight256 (0, nRot));
 			SetTile (other->Mesh, other->tile, desc, vectMesh, land, nelPatchChg, &backupStack);
-			
+
 			// Add to visited tile set
 			visited.insert (other);
 		}
@@ -1037,14 +1037,14 @@ bool EPM_PaintMouseProc::PutATile ( EPM_PaintTile* pTile, int tileSet, int curRo
 			case 0:
 				// Main
 				if (pTile->voisins[3])
-					if (!PropagateBorder (pTile->voisins[3], (pTile->rotate[3]+curRotation)&3, tileSet, visited, bank, 
+					if (!PropagateBorder (pTile->voisins[3], (pTile->rotate[3]+curRotation)&3, tileSet, visited, bank,
 							vectMesh, land, nelPatchChg, backupStack))
 					{
 						bContinue=false;
 						goto zap;
 					}
 				if (pTile->voisins[0])
-					if (!PropagateBorder (pTile->voisins[0], (pTile->rotate[0]+curRotation)&3, tileSet, visited, bank, 
+					if (!PropagateBorder (pTile->voisins[0], (pTile->rotate[0]+curRotation)&3, tileSet, visited, bank,
 							vectMesh, land, nelPatchChg, backupStack))
 					{
 						bContinue=false;
@@ -1212,13 +1212,13 @@ zap:;
 			for (uint corner=0; corner<4; corner++)
 			{
 				finalCorner[corner].TileSet = -1;
-				
+
 				// All the same or empty ?
 				for (uint layer=0; layer<4; layer++)
 				{
 					// Compatible ?
-					if ( ( finalCorner[corner].TileSet == -1 ) 
-						|| ( tileSetCases[layer][corner].TileSet == -1 ) 
+					if ( ( finalCorner[corner].TileSet == -1 )
+						|| ( tileSetCases[layer][corner].TileSet == -1 )
 						|| ( tileSetCases[layer][corner] == finalCorner[corner] ) )
 					{
 						// Copy the tile
@@ -1265,7 +1265,7 @@ zap:;
 							bFind=true;
 					}
 				}
-				
+
 				// no, ok push it back.
 				if (!bFind)
 					setIndex.push_back (finalCorner[v]);
@@ -1369,7 +1369,7 @@ zap:;
 					finalIndex[l].Tile=tileTrans->getTile();
 				}
 			}
-			
+
 			// Set the border desc
 			tileDesc desc;
 			GetTile (pTile->Mesh, pTile->tile, desc, vectMesh, land);
@@ -1403,8 +1403,8 @@ zap:;
 
 /*-------------------------------------------------------------------*/
 
-void EPM_PaintMouseProc::PutADisplacetile ( EPM_PaintTile* pTile, const CTileBank& bank, 
-								   std::vector<EPM_Mesh>& vectMesh, 
+void EPM_PaintMouseProc::PutADisplacetile ( EPM_PaintTile* pTile, const CTileBank& bank,
+								   std::vector<EPM_Mesh>& vectMesh,
 								   CLandscape* land, CNelPatchChanger& nelPatchChg)
 {
 	// Get tile description
@@ -1431,8 +1431,8 @@ void EPM_PaintMouseProc::PutADisplacetile ( EPM_PaintTile* pTile, const CTileBan
 
 /*-------------------------------------------------------------------*/
 
-bool EPM_PaintMouseProc::GetBorderDesc (EPM_PaintTile* tile, tileSetIndex *pVoisinCorner, CTileSet::TFlagBorder pBorder[4][3], 
-										tileDesc *pVoisinIndex, const CTileBank& bank, std::vector<EPM_Mesh>& vectMesh, 
+bool EPM_PaintMouseProc::GetBorderDesc (EPM_PaintTile* tile, tileSetIndex *pVoisinCorner, CTileSet::TFlagBorder pBorder[4][3],
+										tileDesc *pVoisinIndex, const CTileBank& bank, std::vector<EPM_Mesh>& vectMesh,
 										CNelPatchChanger& nelPatchChg, CLandscape *land)
 {
 	// Tile info
@@ -1445,7 +1445,7 @@ bool EPM_PaintMouseProc::GetBorderDesc (EPM_PaintTile* tile, tileSetIndex *pVois
 	tileIndex pIndexx[3];
 	for (int nL=0; nL<nLayer; nL++)
 	{
-		// GetTileIndex 
+		// GetTileIndex
 		tileIndex index=backup.getLayer (nL);
 		pIndexx[nL]=index;
 
@@ -1515,7 +1515,7 @@ const CTileSetTransition* EPM_PaintMouseProc::FindTransition (int nTileSet, int
 	}
 
 	// Look for good tile..
-	CTileSet::TTransition nTransition=CTileSet::getTransitionTile 
+	CTileSet::TTransition nTransition=CTileSet::getTransitionTile
 		(pBorderConverted[3], pBorderConverted[1], pBorderConverted[0], pBorderConverted[2]);
 	//nlassert (nTransition!=CTileSet::notfound);
 	if (nTransition==CTileSet::notfound)
@@ -1537,7 +1537,7 @@ int EPM_PaintMouseProc::getLayer (EPM_PaintTile* tile, int border, int tileSet,
 		tileIndex index=desc.getLayer(o);
 		index.Rotate-=tile->rotate[border];
 		index.Rotate&=3;
-		
+
 		CTileBank::TTileType type;
 		int TileSet, number;
 
@@ -1554,8 +1554,8 @@ int EPM_PaintMouseProc::getLayer (EPM_PaintTile* tile, int border, int tileSet,
 
 /*-------------------------------------------------------------------*/
 
-bool EPM_PaintMouseProc::PropagateBorder (EPM_PaintTile* tile, int curRotation, int curTileSet, std::set<EPM_PaintTile*>& visited, 
-										  const CTileBank& bank, std::vector<EPM_Mesh>& vectMesh, 
+bool EPM_PaintMouseProc::PropagateBorder (EPM_PaintTile* tile, int curRotation, int curTileSet, std::set<EPM_PaintTile*>& visited,
+										  const CTileBank& bank, std::vector<EPM_Mesh>& vectMesh,
 										  CLandscape* land, CNelPatchChanger& nelPatchChg, std::vector<CBackupValue>& backupStack, bool recurseNoDiff)
 {
 	// 1) Already visited
@@ -1698,7 +1698,7 @@ bool EPM_PaintMouseProc::PropagateBorder (EPM_PaintTile* tile, int curRotation,
 							}
 							extraOrdinary[v]++;
 							bDiff=true;
-						}					
+						}
 					}
 					else
 					{
@@ -1799,7 +1799,7 @@ bool EPM_PaintMouseProc::PropagateBorder (EPM_PaintTile* tile, int curRotation,
 					(desc1.isEmpty())||
 					(desc1.getCase()!=(1+((nCase+3)&3)))||
 					(desc1.getLayer(0).Tile!=backup.getLayer(0).Tile)||
-					(desc1.getLayer(0).Rotate!=((backup.getLayer(0).Rotate-rot)&3))					
+					(desc1.getLayer(0).Rotate!=((backup.getLayer(0).Rotate-rot)&3))
 					)
 					bDiff=true;
 			}
@@ -1868,7 +1868,7 @@ bool EPM_PaintMouseProc::PropagateBorder (EPM_PaintTile* tile, int curRotation,
 					bFind=true;
 			}
 		}
-		
+
 		// no, ok push it back.
 		if (!bFind)
 			setIndex.push_back (nCorner[v]);
@@ -1877,7 +1877,7 @@ bool EPM_PaintMouseProc::PropagateBorder (EPM_PaintTile* tile, int curRotation,
 	std::sort (setIndex.begin(), setIndex.end());
 
 	// Check validity
-	
+
 	// A) Check for more than 3 materials
 	if (setIndex.size()>3)
 		return false;
@@ -1981,18 +1981,18 @@ bool EPM_PaintMouseProc::PropagateBorder (EPM_PaintTile* tile, int curRotation,
 							// Last on the stack ?
 							if (*ite<nCorner[c])
 							{
-								// no, 
+								// no,
 								wanted=CTileSet::_1000;
 								invWanted=CTileSet::_1110;
 							}
 							else
 							{
-								// yes, 
+								// yes,
 								wanted=CTileSet::_1110;
 								invWanted=CTileSet::_1000;
 							}
 							border[c]=wanted;
-							
+
 							// If voisin already visited, force his transition to 3/4
 							if (tile->voisins[c])
 							{
@@ -2034,7 +2034,7 @@ bool EPM_PaintMouseProc::PropagateBorder (EPM_PaintTile* tile, int curRotation,
 												return false;
 
 											// Set the tile..
-											SetTile (tile->voisins[c]->Mesh, tile->voisins[c]->tile, pVoisinIndex, vectMesh, 
+											SetTile (tile->voisins[c]->Mesh, tile->voisins[c]->tile, pVoisinIndex, vectMesh,
 												land, nelPatchChg, &backupStack);
 										}
 										/*if (pBorder[edge][nLayer]==CTileSet::_0001)
@@ -2045,11 +2045,11 @@ bool EPM_PaintMouseProc::PropagateBorder (EPM_PaintTile* tile, int curRotation,
 								}
 							}
 						}
-						// Normal, 
+						// Normal,
 						else
 						{
 							// Voisin visited or frozen ?
-							if (tile->voisins[c]&&((visited.find (tile->voisins[c])!=visited.end()) /*|| 
+							if (tile->voisins[c]&&((visited.find (tile->voisins[c])!=visited.end()) /*||
 								(vectMesh[tile->voisins[c]->Mesh].Node->IsFrozen())*/ ))
 							{
 								// Yes, visited. Copy the border
@@ -2057,7 +2057,7 @@ bool EPM_PaintMouseProc::PropagateBorder (EPM_PaintTile* tile, int curRotation,
 								CTileSet::TFlagBorder pBorder[4][3];
 								tileDesc pVoisinIndex;
 								bool bOk=GetBorderDesc (tile->voisins[c], pVoisinCorner, pBorder, &pVoisinIndex, bank, vectMesh, nelPatchChg, land);
-								
+
 								// Should not be empty
 								nlassert (bOk);
 								int edge=(2+c+tile->rotate[c])&3;
@@ -2075,7 +2075,7 @@ bool EPM_PaintMouseProc::PropagateBorder (EPM_PaintTile* tile, int curRotation,
 							else
 							{
 								// No, not yet visited
-								
+
 								// Choose transition by random
 								bool bComputed=false;
 								if ((bVisited[c]||!recurseNoDiff)&&bSameEdge[c])
@@ -2086,7 +2086,7 @@ bool EPM_PaintMouseProc::PropagateBorder (EPM_PaintTile* tile, int curRotation,
 									CTileSet::TFlagBorder pBorder[4][3];
 									tileDesc pVoisinIndex;
 									bool bOk=GetBorderDesc (tile->voisins[c], pVoisinCorner, pBorder, &pVoisinIndex, bank, vectMesh, nelPatchChg, land);
-								
+
 									// ok voisin is here ?
 									if (bOk)
 									{
@@ -2140,18 +2140,18 @@ bool EPM_PaintMouseProc::PropagateBorder (EPM_PaintTile* tile, int curRotation,
 							// Last on the stack ?
 							if (*ite<nCorner[c])
 							{
-								// no, 
+								// no,
 								wanted=CTileSet::_0001;
 								invWanted=CTileSet::_0111;
 							}
 							else
 							{
-								// yes, 
+								// yes,
 								wanted=CTileSet::_0111;
 								invWanted=CTileSet::_0001;
 							}
 							border[c]=wanted;
-							
+
 							// If voisin already visited, force his transition to 3/4
 							if (tile->voisins[c])//&&visited.find (tile->voisins[c])!=visited.end())
 							{
@@ -2193,7 +2193,7 @@ bool EPM_PaintMouseProc::PropagateBorder (EPM_PaintTile* tile, int curRotation,
 												return false;
 
 											// Set the tile..
-											SetTile (tile->voisins[c]->Mesh, tile->voisins[c]->tile, pVoisinIndex, vectMesh, 
+											SetTile (tile->voisins[c]->Mesh, tile->voisins[c]->tile, pVoisinIndex, vectMesh,
 												land, nelPatchChg, &backupStack);
 										}
 										/*if (pBorder[edge][nLayer]==CTileSet::_1000)
@@ -2205,7 +2205,7 @@ bool EPM_PaintMouseProc::PropagateBorder (EPM_PaintTile* tile, int curRotation,
 							}
 
 						}
-						// Normal, 
+						// Normal,
 						else
 						{
 							// Voisin visited ?
@@ -2216,7 +2216,7 @@ bool EPM_PaintMouseProc::PropagateBorder (EPM_PaintTile* tile, int curRotation,
 								CTileSet::TFlagBorder pBorder[4][3];
 								tileDesc pVoisinIndex;
 								bool bOk=GetBorderDesc (tile->voisins[c], pVoisinCorner, pBorder, &pVoisinIndex, bank, vectMesh, nelPatchChg, land);
-								
+
 								// Should not be empty
 								nlassert (bOk);
 								int edge=(2+c+tile->rotate[c])&3;
@@ -2235,7 +2235,7 @@ bool EPM_PaintMouseProc::PropagateBorder (EPM_PaintTile* tile, int curRotation,
 							else
 							{
 								// No, not yet visited
-								
+
 								// Choose transition by random
 								bool bComputed=false;
 								if ((bVisited[c]||!recurseNoDiff)&&bSameEdge[c])
@@ -2246,7 +2246,7 @@ bool EPM_PaintMouseProc::PropagateBorder (EPM_PaintTile* tile, int curRotation,
 									CTileSet::TFlagBorder pBorder[4][3];
 									tileDesc pVoisinIndex;
 									bool bOk=GetBorderDesc (tile->voisins[c], pVoisinCorner, pBorder, &pVoisinIndex, bank, vectMesh, nelPatchChg, land);
-								
+
 									// ok voisin is here ?
 									if (bOk)
 									{
@@ -2293,7 +2293,7 @@ bool EPM_PaintMouseProc::PropagateBorder (EPM_PaintTile* tile, int curRotation,
 		}
 		ite++;
 	}
-	
+
 	// Set the border desc
 	tileDesc desc;
 	GetTile (tile->Mesh, tile->tile, desc, vectMesh, land);
@@ -2341,22 +2341,22 @@ bool EPM_PaintMouseProc::PropagateBorder (EPM_PaintTile* tile, int curRotation,
 	{
 		// Voisin not already visited and not frozen ?
 		if ((tile->voisins[v]) && (visited.find (tile->voisins[v])==visited.end()) /* && (vectMesh[tile->voisins[v]->Mesh].Node->IsFrozen()==0)*/)
-		{	
+		{
 			// ok.. not visited, border with modified corner ?
 			if (bModified[v]||bModified[(v+1)&3]||(!bSameEdge[v]))
-			if (!PropagateBorder (tile->voisins[v], (tile->rotate[v]+curRotation)&3, curTileSet, visited, bank, vectMesh, land, nelPatchChg, 
+			if (!PropagateBorder (tile->voisins[v], (tile->rotate[v]+curRotation)&3, curTileSet, visited, bank, vectMesh, land, nelPatchChg,
 									backupStack, false))
 			{
 				bContinue=false;
 				break;
-			}				
+			}
 		}
 	}
 	if (!bContinue)
-	{		
+	{
 		return false;
 	}
-	
+
 	return true;
 }
 
@@ -2413,8 +2413,8 @@ uint8 EPM_PaintMouseProc::CalcRotPath (EPM_PaintTile* from, EPM_PaintTile* to, i
 static TModePaint nModeTexture=ModeTile;
 static TModeMouse modeSelect=ModePaint;
 
-void EPM_PaintMouseProc::RecursTile (EPM_PaintTile* pTile, const CTileBank& bank, int tileSet, std::vector<EPM_Mesh>& vectMesh, CLandscape* land, 
-									 int recurs, std::set<EPM_PaintTile*>& alreadyRecursed, bool first, int rotation, 
+void EPM_PaintMouseProc::RecursTile (EPM_PaintTile* pTile, const CTileBank& bank, int tileSet, std::vector<EPM_Mesh>& vectMesh, CLandscape* land,
+									 int recurs, std::set<EPM_PaintTile*>& alreadyRecursed, bool first, int rotation,
 									 CNelPatchChanger& nelPatchChg, bool _256)
 {
 	if (alreadyRecursed.find (pTile)==alreadyRecursed.end())
@@ -2437,20 +2437,20 @@ void EPM_PaintMouseProc::RecursTile (EPM_PaintTile* pTile, const CTileBank& bank
 			if (_256)
 			{
 				if (pTile->get2Voisin(i))
-					RecursTile (pTile->get2Voisin(i), bank, tileSet, vectMesh, land, recurs-2, alreadyRecursed, false, 
+					RecursTile (pTile->get2Voisin(i), bank, tileSet, vectMesh, land, recurs-2, alreadyRecursed, false,
 						(rotation+pTile->get2VoisinRotate(i))&3, nelPatchChg, true);
 			}
 			else
 			{
 				if (pTile->voisins[i])
-					RecursTile (pTile->voisins[i], bank, tileSet, vectMesh, land, recurs-1, alreadyRecursed, false, (rotation+pTile->rotate[i])&3, 
+					RecursTile (pTile->voisins[i], bank, tileSet, vectMesh, land, recurs-1, alreadyRecursed, false, (rotation+pTile->rotate[i])&3,
 						nelPatchChg, false);
 			}
 		}
 	}
 }
 
-BOOL EPM_PaintMouseProc::PutDisplace (int tile, int mesh, const CTileBank& bank, std::vector<EPM_Mesh>& vectMesh, CLandscape* land, 
+BOOL EPM_PaintMouseProc::PutDisplace (int tile, int mesh, const CTileBank& bank, std::vector<EPM_Mesh>& vectMesh, CLandscape* land,
 								  int recurs, std::set<EPM_PaintTile*>& alreadyRecursed, CNelPatchChanger& nelPatchChg)
 {
 	static sint32 MeshOld=-1;
@@ -2460,7 +2460,7 @@ BOOL EPM_PaintMouseProc::PutDisplace (int tile, int mesh, const CTileBank& bank,
 	EPM_PaintTile* pTile=&metaTile[mesh][tile];
 
 	// Ok recurse tiles
-	RecursTile (pTile, bank, 0, vectMesh, land, brushValue[PaintPatchMod::brushSize], alreadyRecursed, true, 
+	RecursTile (pTile, bank, 0, vectMesh, land, brushValue[PaintPatchMod::brushSize], alreadyRecursed, true,
 		EPM_PaintMouseProc::Rotation, nelPatchChg, false);
 
 	MeshOld=mesh;
@@ -2469,7 +2469,7 @@ BOOL EPM_PaintMouseProc::PutDisplace (int tile, int mesh, const CTileBank& bank,
 	return TRUE;
 }
 
-BOOL EPM_PaintMouseProc::PutTile (int tile, int mesh, bool first, const CTileBank& bank, int tileSet, std::vector<EPM_Mesh>& vectMesh, CLandscape* land, 
+BOOL EPM_PaintMouseProc::PutTile (int tile, int mesh, bool first, const CTileBank& bank, int tileSet, std::vector<EPM_Mesh>& vectMesh, CLandscape* land,
 								  int recurs, std::set<EPM_PaintTile*>& alreadyRecursed, CNelPatchChanger& nelPatchChg, bool _256)
 {
 	static sint32 MeshOld=-1;
@@ -2523,7 +2523,7 @@ BOOL EPM_PaintMouseProc::PutTile (int tile, int mesh, bool first, const CTileBan
 			std::set<EPM_PaintTile*> alreadyRecursed;
 
 			// Ok recurse tiles
-			RecursTile (pTile, bank, tileSet, vectMesh, land, brushValue[PaintPatchMod::brushSize], alreadyRecursed, first, 
+			RecursTile (pTile, bank, tileSet, vectMesh, land, brushValue[PaintPatchMod::brushSize], alreadyRecursed, first,
 				EPM_PaintMouseProc::Rotation, nelPatchChg, _256);
 		}
 		MeshOld=mesh;
@@ -2815,7 +2815,7 @@ void	mainproc(CScene& scene, CEventListenerAsync& AsyncListener, CEvent3dMouseLi
 	if (AsyncListener.isKeyPushed ((TKey)PainterKeys[SelectColorBrush]))
 	{
 		// Create a dialog filter
-		static TCHAR szFilter[] = 
+		static TCHAR szFilter[] =
 			_T("Targa Files (*.tga)\0*.tga\0")
 			_T("All Files (*.*)\0*.*\0\0");
 
@@ -2837,7 +2837,7 @@ void	mainproc(CScene& scene, CEventListenerAsync& AsyncListener, CEvent3dMouseLi
 
 		// Open the dialog
 		if (GetOpenFileName(&openFile))
-		{		
+		{
 			// Load the file
 			paintColor.loadBrush (tStrToUtf8(buffer));
 			paintColor.setBrushMode (true);
@@ -2991,7 +2991,7 @@ void	mainproc(CScene& scene, CEventListenerAsync& AsyncListener, CEvent3dMouseLi
 
 		t0= t1;
 	}
-		
+
 	// Draw interface
 	drawInterface (modeSelect, nModeTexture, pData->pobj, driver, landscape, paintColor);
 
@@ -3016,7 +3016,7 @@ public:
 	bool					WindowActive;
 	CPaintColor				PaintColor;
 public:
-	MouseListener (IObjParam *ip, CCamera *camera, CViewport *viewport, PaintPatchMod *pobj, EPM_PaintMouseProc *eproc, CLandscape* land, 
+	MouseListener (IObjParam *ip, CCamera *camera, CViewport *viewport, PaintPatchMod *pobj, EPM_PaintMouseProc *eproc, CLandscape* land,
 					CEventListenerAsync* async, CEvent3dMouseListener* mouseList, std::vector<EPM_Mesh>& vectMesh, TimeValue t)
 		: PaintColor (pobj, land, &bankCont->Undo, eproc), _FillTile (pobj, land, &bankCont->Undo, eproc), _VectMesh(vectMesh)
 	{
@@ -3063,7 +3063,7 @@ private:
 				if (pressed&&((mouse->Button&rightButton)&&((mouse->Button&(ctrlButton|shiftButton|altButton))==0)))
 				{
 					pressed=false;
-								
+
 					// Undo step
 					bankCont->Undo.pushUndo ();
 
@@ -3099,13 +3099,13 @@ private:
 									if (nModeTexture==ModeTile)
 									{
 										// Put the tile
-										_Eproc->PutTile (tile1, mesh1, true, bank, _Pobj->CurrentTileSet, _VectMesh, _Land, brushValue[PaintPatchMod::brushSize], 
+										_Eproc->PutTile (tile1, mesh1, true, bank, _Pobj->CurrentTileSet, _VectMesh, _Land, brushValue[PaintPatchMod::brushSize],
 											alreadyRecursed, nelPatchChg, _Pobj->tileSize!=0);
 									}
 									else // (nModeTexture==ModeDisplace)
-									{										
+									{
 										// Put the tile
-										_Eproc->PutDisplace (tile1, mesh1, bank, _VectMesh, _Land, brushValue[PaintPatchMod::brushSize], 
+										_Eproc->PutDisplace (tile1, mesh1, bank, _VectMesh, _Land, brushValue[PaintPatchMod::brushSize],
 											alreadyRecursed, nelPatchChg);
 									}
 
@@ -3141,7 +3141,7 @@ private:
 							// Paint mode
 							if (nModeTexture==ModeTile)
 								// Fill this patch with the current tile
-								_FillTile.fillTile (mesh1, patch, _VectMesh, _Pobj->CurrentTileSet, _Pobj->TileFillRotation, _Pobj->TileGroup, _Pobj->tileSize!=0, 
+								_FillTile.fillTile (mesh1, patch, _VectMesh, _Pobj->CurrentTileSet, _Pobj->TileFillRotation, _Pobj->TileGroup, _Pobj->tileSize!=0,
 													bank);
 							else if (nModeTexture==ModeColor)
 								// Fill this patch with the current color
@@ -3188,7 +3188,7 @@ private:
 				{
 					pressed = false;
 					_Pobj->ShowCurrentState = false;
-					
+
 					// Undo step
 					bankCont->Undo.pushUndo ();
 				}
@@ -3222,13 +3222,13 @@ private:
 									if (nModeTexture==ModeTile)
 									{
 										// Put the tile
-										_Eproc->PutTile (tile2, mesh2, false, bank, _Pobj->CurrentTileSet, _VectMesh, _Land, 
+										_Eproc->PutTile (tile2, mesh2, false, bank, _Pobj->CurrentTileSet, _VectMesh, _Land,
 											brushValue[PaintPatchMod::brushSize], alreadyRecursed, nelPatchChg, _Pobj->tileSize!=0);
 									}
 									else // (nModeTexture==ModeDisplace)
-									{										
+									{
 										// Put the tile
-										_Eproc->PutDisplace (tile2, mesh2, bank, _VectMesh, _Land, brushValue[PaintPatchMod::brushSize], 
+										_Eproc->PutDisplace (tile2, mesh2, bank, _VectMesh, _Land, brushValue[PaintPatchMod::brushSize],
 											alreadyRecursed, nelPatchChg);
 									}
 
@@ -3299,7 +3299,7 @@ private:
 							_Pobj->CurrentTileSet=tileSetSelector.getTileSet (tile-1);
 							_Pobj->DisplaceTileSet=_Pobj->CurrentTileSet;
 						}
-					}			
+					}
 				}
 
 				// Mode displace ?
@@ -3308,7 +3308,7 @@ private:
 					if ((tile>=0)&&(tile<CTileSet::CountDisplace))
 					{
 						_Pobj->DisplaceTile=tile;
-					}			
+					}
 				}
 			}
 		}
@@ -3345,7 +3345,7 @@ void MouseListener::pick (int mesh, int tile, const CVector& hit, TModePaint mod
 			// Pickup a displace ?
 			else
 			{
-				// Get the displace tile index 
+				// Get the displace tile index
 				_Pobj->DisplaceTile=desc.getDisplace ();
 				_Pobj->DisplaceTileSet=tileSet;
 			}
@@ -3522,7 +3522,7 @@ void EPM_PaintCMode::DoPaint ()
 	static float best = 10000.f;
 
 	// Set local to english
-	setlocale (LC_NUMERIC, "English");
+	setlocale (LC_NUMERIC, "C");
 
 	if (pobj->hOpsPanel)
 	{
@@ -3577,7 +3577,7 @@ void EPM_PaintCMode::DoPaint ()
 				int nV=1<<rpatch->getUIPatch (p).NbTilesV;
 				for (int u=0; u<=nU; u++)
 				for (int v=0; v<=nV; v++)
-				{					
+				{
 					Point3 pos=patch->patches[p].interp (patch, (float)u/(float)(nU), (float)v/(float)(nV));
 					pos=pos*(vectMesh[i].Node->GetObjectTM (t));
 					if (fMaxX<pos.x)
@@ -3643,7 +3643,7 @@ void EPM_PaintCMode::DoPaint ()
 					pTile->rotate[2]=0;
 					pTile->u=u;
 					pTile->v=v;
-					
+
 					// Compute bouding box of the tile
 					fMinX=FLT_MAX;
 					fMinY=FLT_MAX;
@@ -3665,7 +3665,7 @@ void EPM_PaintCMode::DoPaint ()
 					pTile->Center=(maxToNel (pos[0])+maxToNel (pos[1])+maxToNel (pos[2])+maxToNel (pos[3]))/4.f;
 
 					// Store its radius
-					pTile->Radius=std::max 
+					pTile->Radius=std::max
 									(
 										std::max ( (maxToNel (pos[0])-pTile->Center).norm(), (maxToNel (pos[1])-pTile->Center).norm() ),
 										std::max ( (maxToNel (pos[2])-pTile->Center).norm(), (maxToNel (pos[3])-pTile->Center).norm() )
@@ -3958,7 +3958,7 @@ void EPM_PaintCMode::DoPaint ()
 					pTile->locked = 0;
 
 					// Check that neighbor tiles are not frozen
-					uint neighbor;					
+					uint neighbor;
 					for (neighbor=0; neighbor<4; neighbor++)
 					{
 						// Neighbor exist ?
@@ -4009,7 +4009,7 @@ void EPM_PaintCMode::DoPaint ()
 		pData->pobj=pobj;
 		pData->center=center;
 		pData->T=t;
-		
+
 		myThread (pData);		// Do it without thread
 
 		// Invalidate all objects
@@ -4082,9 +4082,9 @@ bool loadLigoConfigFile (CLigoConfig& config, Interface& it)
 	// Can't found the module
 	return false;
 }
-	
+
 DWORD WINAPI myThread (LPVOID vData)
-{	
+{
 	// Mega try
 	try
 	{
@@ -4109,7 +4109,7 @@ DWORD WINAPI myThread (LPVOID vData)
 		}
 
 		// The scene
-		
+
 		// Loaf cfg files
 		LoadKeyCfg ();
 		LoadVarCfg ();
@@ -4155,7 +4155,7 @@ DWORD WINAPI myThread (LPVOID vData)
 					{
 						// Build skined ?
 						bool skined=false;
-						
+
 						// Export the shape
 						IShape *pShape;
 						pShape=export_.buildShape (*pNode, pData->T, NULL, true);
@@ -4193,7 +4193,7 @@ DWORD WINAPI myThread (LPVOID vData)
 			CMatrix	mat;
 			mat.identity();
 			CVector	I,J,K,P;
-			
+
 			Matrix3 matInvert;
 			matInvert.SetRow (0, Point3(1.f, 0.f, 0.f));
 			matInvert.SetRow (1, Point3(0.f, 0.f, 1.f));
@@ -4275,7 +4275,7 @@ DWORD WINAPI myThread (LPVOID vData)
 			// Go.
 			//========
 			CEvent3dMouseListener	mouseListener;
-			MouseListener			listener (pData->eproc->ip, CNELU::Camera, &viewport, pData->pobj, pData->eproc, &TheLand->Landscape, 
+			MouseListener			listener (pData->eproc->ip, CNELU::Camera, &viewport, pData->pobj, pData->eproc, &TheLand->Landscape,
 				&CNELU::AsyncListener, &mouseListener, pData->VectMesh, pData->T);
 
 			// Mouse listener
@@ -4303,7 +4303,7 @@ DWORD WINAPI myThread (LPVOID vData)
 			{
 				// For all the tileset selected
 				for (sint tss=0; tss<(sint)tileSetSelector.getTileCount (); tss++)
-				{			
+				{
 					// Get the tileset index
 					sint ts=tileSetSelector.getTileSet (tss);
 
@@ -4434,7 +4434,7 @@ BOOL EPM_PaintMouseProc::HitATile(ViewExp *vpt, IPoint2 *p, int *tile, int *mesh
 	return FALSE;
 }
 
-BOOL EPM_PaintMouseProc::HitATile(const CViewport& viewport, const CCamera& camera, float x, float y, int *tile, int *mesh, TimeValue t, 
+BOOL EPM_PaintMouseProc::HitATile(const CViewport& viewport, const CCamera& camera, float x, float y, int *tile, int *mesh, TimeValue t,
 								  std::vector<EPM_Mesh>& vectMesh, NLMISC::CVector& hit, NLMISC::CVector &topVector)
 {
 	// Get a world ray with the mouse 2d point
@@ -4581,10 +4581,10 @@ bool EPM_PaintTile::intersect (const Ray& ray, std::vector<EPM_Mesh>& vectMesh,
 /*-------------------------------------------------------------------*/
 
 int EPM_PaintMouseProc::proc(
-			HWND hwnd, 
-			int msg, 
-			int point, 
-			int flags, 
+			HWND hwnd,
+			int msg,
+			int point,
+			int flags,
 			IPoint2 m)
 {
 #if MAX_VERSION_MAJOR >= 19
@@ -4611,10 +4611,10 @@ int EPM_PaintMouseProc::proc(
 
 		case MOUSE_MOVE:
 			break;
-					
+
 		case MOUSE_FREEMOVE:
 			break;
-		
+
 		case MOUSE_ABORT:
 			ip->SetStdCommandMode(CID_OBJMOVE);
 			break;
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_rollup.cpp b/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_rollup.cpp
index 0b4714090..e225adaa4 100644
--- a/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_rollup.cpp
+++ b/code/nel/tools/3d/plugin_max/nel_patch_paint/paint_rollup.cpp
@@ -28,13 +28,13 @@ extern void LoadImages();
 
 // ------------------------------------------------------------------------------------------------------------------------------------------------------
 
-void PaintPatchMod::SetOpsDlgEnables() 
+void PaintPatchMod::SetOpsDlgEnables()
 {
 	if (!hOpsPanel)
 		return;
-	
+
 	nlassert(ip);
-	
+
 	ICustButton *but;
 
 	but = GetICustButton(GetDlgItem(hOpsPanel, IDC_PAINT));
@@ -52,12 +52,12 @@ INT_PTR CALLBACK PatchOpsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 
 	switch (message)
 	{
-		case WM_INITDIALOG: 
+		case WM_INITDIALOG:
 		{
 		 	ep =(PaintPatchMod *)lParam;
 		 	ep->hOpsPanel = hDlg;
 
-			SetWindowLongPtr(hDlg, GWLP_USERDATA, (LONG_PTR)ep);		 	
+			SetWindowLongPtr(hDlg, GWLP_USERDATA, (LONG_PTR)ep);
 
 			CheckDlgButton(hDlg, IDC_INCLUDE_MESHES, ep->includeMeshes);
 			CheckDlgButton(hDlg, IDC_PRELOAD_TILES, ep->preloadTiles);
@@ -65,15 +65,9 @@ INT_PTR CALLBACK PatchOpsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 			return TRUE;
 		}
 
-		case WM_LBUTTONDOWN:
-		case WM_LBUTTONUP:
-		case WM_MOUSEMOVE:   			
-   			ep->ip->RollupMouseMessage(hDlg, message, wParam, lParam);
-			return FALSE;		
-		
-		case WM_COMMAND:			
+		case WM_COMMAND:
 			switch (LOWORD(wParam))
-			{				
+			{
 				case IDC_INCLUDE_MESHES:
 					{
 						BOOL bCheck=(IsDlgButtonChecked(hDlg, IDC_INCLUDE_MESHES)==BST_CHECKED);
@@ -92,7 +86,7 @@ INT_PTR CALLBACK PatchOpsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 			}
 			break;
 		}
-	
+
 	return FALSE;
 }
 
diff --git a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.cpp b/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.cpp
index 3a513683a..664ec0868 100644
--- a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.cpp
+++ b/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.cpp
@@ -119,9 +119,9 @@ static INT_PTR CALLBACK VertexPaintDlgProc(HWND hWnd, UINT msg, WPARAM wParam, L
 
 
 		// Init comboBox
-		SendDlgItemMessage(hWnd, IDC_COMBO_TYPE, CB_ADDSTRING, 0, (LPARAM)"Tree Weight");
-		SendDlgItemMessage(hWnd, IDC_COMBO_TYPE, CB_ADDSTRING, 0, (LPARAM)"Phase Level 1");
-		SendDlgItemMessage(hWnd, IDC_COMBO_TYPE, CB_ADDSTRING, 0, (LPARAM)"Phase Level 2");
+		SendDlgItemMessage(hWnd, IDC_COMBO_TYPE, CB_ADDSTRING, 0, (LPARAM)_T("Tree Weight"));
+		SendDlgItemMessage(hWnd, IDC_COMBO_TYPE, CB_ADDSTRING, 0, (LPARAM)_T("Phase Level 1"));
+		SendDlgItemMessage(hWnd, IDC_COMBO_TYPE, CB_ADDSTRING, 0, (LPARAM)_T("Phase Level 2"));
 		SendDlgItemMessage(hWnd, IDC_COMBO_TYPE, CB_SETCURSEL, mod->getEditionType(), 0);
 
 		// If paint mode at last edit.
diff --git a/code/nel/tools/3d/plugin_max/tile_utility/tile_utility.cpp b/code/nel/tools/3d/plugin_max/tile_utility/tile_utility.cpp
index c77a027a9..893f44eea 100644
--- a/code/nel/tools/3d/plugin_max/tile_utility/tile_utility.cpp
+++ b/code/nel/tools/3d/plugin_max/tile_utility/tile_utility.cpp
@@ -156,11 +156,6 @@ static INT_PTR CALLBACK Tile_utilityDlgProc(HWND hWnd, UINT msg, WPARAM wParam,
 		//  load the sampler dropdown
 		theTile_utility.Destroy(hWnd);
 		break;
-	case WM_LBUTTONDOWN:
-	case WM_LBUTTONUP:
-	case WM_MOUSEMOVE:
-		theTile_utility.ip->RollupMouseMessage(hWnd,msg,wParam,lParam);
-		break;
 	case WM_COMMAND:
 		{
 			int id = LOWORD(wParam);
@@ -342,7 +337,7 @@ void Tile_utility::SetupUI ()
 		std::string name=Bank.getLand(nLand)->getName();
 		if (hCombo)
 		{
-			SendMessage (hCombo, CB_INSERTSTRING, -1, (LPARAM) name.c_str());
+			SendMessage (hCombo, CB_INSERTSTRING, -1, (LPARAM)utf8ToTStr(name));
 		}
 	}
 
diff --git a/code/nel/tools/3d/tile_edit/GetVal.cpp b/code/nel/tools/3d/tile_edit/GetVal.cpp
index 13128feb5..ff9bcf660 100644
--- a/code/nel/tools/3d/tile_edit/GetVal.cpp
+++ b/code/nel/tools/3d/tile_edit/GetVal.cpp
@@ -64,8 +64,8 @@ void GetVal::OnOK()
 	CString rString;
 	EditStr->GetWindowText( rString );
 	int size = rString.GetLength();
-	name = new char[size+1];
-	strcpy (name, rString);
+	name = new TCHAR[size+1];
+	_tcscpy(name, rString);
 	/**((short*)name)=size;
 	EditStr->GetLine(0,name,size);
 	for (int i=0;i<size;i++)
diff --git a/code/nel/tools/3d/tile_edit/GetVal.h b/code/nel/tools/3d/tile_edit/GetVal.h
index 37292c7de..a3e9b070d 100644
--- a/code/nel/tools/3d/tile_edit/GetVal.h
+++ b/code/nel/tools/3d/tile_edit/GetVal.h
@@ -31,7 +31,7 @@ class GetVal : public CDialog
 {
 // Construction
 public:
-	char *name;
+	TCHAR *name;
 	int NameOk;
 	GetVal(CWnd* pParent = NULL);   // standard constructor
 
diff --git a/code/nel/tools/3d/tile_edit/SelectionTerritoire.cpp b/code/nel/tools/3d/tile_edit/SelectionTerritoire.cpp
index 400b388d7..198fd7942 100644
--- a/code/nel/tools/3d/tile_edit/SelectionTerritoire.cpp
+++ b/code/nel/tools/3d/tile_edit/SelectionTerritoire.cpp
@@ -98,12 +98,12 @@ void SelectionTerritoire::OnAddTerritoire()
 		CListBox *list=(CListBox*)GetDlgItem(IDC_LIST_TERRITOIRE);
 		if (list->FindStringExact(0,GetStr.name)!=LB_ERR)
 		{
-			MessageBox(_T("Ce nom existe deja","Error"), MB_ICONERROR);
+			MessageBox(_T("Ce nom existe deja"), _T("Error"), MB_ICONERROR);
 		}
 		else
 		{
 			list->InsertString(-1, GetStr.name);
-			tileBank.addLand (GetStr.name);
+			tileBank.addLand (tStrToUtf8(GetStr.name));
 		}
 	}
 }
@@ -119,14 +119,14 @@ private:
 	virtual void OnInit ()
 	{
 		UpdateData ();
-		char sTitle[512];
-		sprintf (sTitle, "Tile sets use by %s", tileBank.getLand(_land)->getName().c_str());
+		TCHAR sTitle[512];
+		_stprintf(sTitle, _T("Tile sets use by %s"), utf8ToTStr(tileBank.getLand(_land)->getName()));
 		SetWindowText (sTitle);
 		for (int i=0; i<tileBank.getTileSetCount(); i++)
 		{
-			m_ctrlCombo.InsertString (-1, tileBank.getTileSet(i)->getName().c_str());
+			m_ctrlCombo.InsertString (-1, utf8ToTStr(tileBank.getTileSet(i)->getName()));
 			if (tileBank.getLand(_land)->isTileSet (tileBank.getTileSet(i)->getName()))
-				m_ctrlList.InsertString (-1, tileBank.getTileSet(i)->getName().c_str());
+				m_ctrlList.InsertString (-1, utf8ToTStr(tileBank.getTileSet(i)->getName()));
 		}
 		UpdateData (FALSE);
 	}
@@ -143,7 +143,7 @@ private:
 		{
 			CString rString;
 			m_ctrlList.GetText(i, rString);
-			tileBank.getLand(_land)->addTileSet ((const char*)rString);
+			tileBank.getLand(_land)->addTileSet (tStrToUtf8(rString));
 		}
 		UpdateData (FALSE);
 	}
@@ -202,7 +202,7 @@ void SelectionTerritoire::OnAddTileSet()
 		else
 		{
 			list->InsertString(-1, GetStr.name);
-			tileBank.addTileSet (GetStr.name);
+			tileBank.addTileSet (tStrToUtf8(GetStr.name));
 		}
 	}
 }
@@ -218,16 +218,18 @@ private:
 	virtual void OnInit ()
 	{
 		UpdateData ();
-		char sTitle[512];
-		sprintf (sTitle, "Children of the tile set %s", tileBank.getTileSet(_tileSet)->getName().c_str());
+		TCHAR sTitle[512];
+		_stprintf(sTitle, _T("Children of the tile set %s"), utf8ToTStr(tileBank.getTileSet(_tileSet)->getName()));
 		SetWindowText (sTitle);
 		for (int i=0; i<tileBank.getTileSetCount(); i++)
 		{
 			if (i!=_tileSet)
-				m_ctrlCombo.InsertString (-1, tileBank.getTileSet(i)->getName().c_str());
+				m_ctrlCombo.InsertString (-1, utf8ToTStr(tileBank.getTileSet(i)->getName()));
+
 			if (tileBank.getTileSet(_tileSet)->isChild (tileBank.getTileSet(i)->getName()))
-				m_ctrlList.InsertString (-1, tileBank.getTileSet(i)->getName().c_str());
+				m_ctrlList.InsertString (-1, utf8ToTStr(tileBank.getTileSet(i)->getName()));
 		}
+
 		UpdateData (FALSE);
 	}
 	virtual void OnOk ()
@@ -243,7 +245,7 @@ private:
 		{
 			CString rString;
 			m_ctrlList.GetText(i, rString);
-			tileBank.getTileSet(_tileSet)->addChild ((const char*)rString);
+			tileBank.getTileSet(_tileSet)->addChild (tStrToUtf8(rString));
 		}
 		UpdateData (FALSE);
 	}
@@ -433,12 +435,12 @@ void SelectionTerritoire::OnSave()
 	Save (str, tileBank);
 }
 
-void SelectionTerritoire::Save(const char* path, CTileBank &toSave)
+void SelectionTerritoire::Save(const TCHAR* path, CTileBank &toSave)
 {
 	// TODO: Add extra validation here
 	{
 		COFile stream;
-		if (stream.open ((const char*)path))
+		if (stream.open (tStrToUtf8(path)))
 		{
 			toSave.serial (stream);
 		}
@@ -452,7 +454,7 @@ void SelectionTerritoire::OnSaveAs()
  	CFileDialog sFile(false, _T("bank"), DefautPath+MainFileName, 0, szFilter, this);
 	if (sFile.DoModal()==IDOK)
 	{
-		Save (tStrToUtf8(sFile.GetPathName()).c_str(), tileBank);
+		Save (sFile.GetPathName(), tileBank);
 		MainFileOk = 1;
 		CButton *button = (CButton*)GetDlgItem(IDC_ADD_TERRITOIRE);
 		button->EnableWindow(true);
@@ -480,27 +482,26 @@ void SelectionTerritoire::OnCancel()
 	}
 }
 
-bool CheckPath (const std::string& path, const char* absolutePathToRemplace)
+bool CheckPath (const std::string& path, const std::string &absolutePathToRemplace)
 {
 	// Look for absolute path in path
-	if (strnicmp (path.c_str(), absolutePathToRemplace, strlen (absolutePathToRemplace))==0)
+	if (strnicmp(path.c_str(), absolutePathToRemplace.c_str(), absolutePathToRemplace.length()) == 0)
 		return true;
-	else
-		return false;
+
+	return false;
 }
 
-bool RemovePath (std::string& path, const char* absolutePathToRemplace)
+bool RemovePath (std::string& path, const std::string &absolutePathToRemplace)
 {
 	// Look for absolute path in path
-	if (strnicmp (path.c_str(), absolutePathToRemplace, strlen (absolutePathToRemplace))==0)
+	if (strnicmp(path.c_str(), absolutePathToRemplace.c_str(), absolutePathToRemplace.length())==0)
 	{
 		// New path
-		std::string toto=path;
-		path=toto.c_str()+strlen (absolutePathToRemplace);
+		path = path.substr(absolutePathToRemplace.length());
 		return true;
 	}
-	else
-		return false;
+
+	return false;
 }
 
 void SelectionTerritoire::OnPath() 
@@ -508,33 +509,34 @@ void SelectionTerritoire::OnPath()
 	// TODO: Add your control notification handler code here
 	
 	// Select a directory.
-	char path[MAX_PATH];
+	TCHAR path[MAX_PATH];
 
 	// Build the struct
 	BROWSEINFO info;
 	memset (&info, 0, sizeof (BROWSEINFO));
-	info.lpszTitle="Select the absolute base path of the bank";
+	info.lpszTitle = _T("Select the absolute base path of the bank");
 	info.ulFlags=BIF_RETURNONLYFSDIRS;
 
 	// Select the path
-	LPITEMIDLIST list;
-	if (list=SHBrowseForFolder (&info))
+	PIDLIST_ABSOLUTE list = SHBrowseForFolder(&info);
+	if (list)
 	{
 		// Convert item into path string
 		BOOL bRet=SHGetPathFromIDList(list, path);
 		nlassert (bRet);
 
 		// Add a final back slash
-		if (strcmp (path, "")!=0)
+		if (_tcscmp(path, _T("")) != 0)
 		{
 			// Add a '\' at the end
-			if (path[strlen (path)-1]!='\\')
-				strcat (path, "\\");
+			if (path[_tcslen(path)-1] != _T('\\'))
+				_tcscat(path, _T("\\"));
 		}
 
 		// Last check
-		char msg[512];
-		sprintf (msg, "Do you really want to set %s as base path of the bank ?", path);
+		TCHAR msg[512];
+		_stprintf(msg, _T("Do you really want to set %s as base path of the bank ?"), path);
+
 		if (MessageBox (msg, _T("TileEdit"), MB_YESNO|MB_ICONQUESTION)==IDYES)
 		{
 			// Set as default path..
@@ -574,13 +576,13 @@ void SelectionTerritoire::OnPath()
 							if (!bitmapPath.empty())
 							{
 								// Check the path
-								if (CheckPath (bitmapPath, path)==false)
+								if (CheckPath (bitmapPath, tStrToUtf8(path))==false)
 								{
 									// Bad path
 									goodPath=false;
 
 									// Make a message
-									sprintf (msg, "Path '%s' can't be found in bitmap '%s'. Continue ?", path, bitmapPath.c_str());
+									_stprintf(msg, _T("Path '%s' can't be found in bitmap '%s'. Continue ?"), path, utf8ToTStr(bitmapPath));
 
 									// Message
 									if (MessageBox (msg, _T("TileEdit"), MB_YESNO|MB_ICONQUESTION)==IDNO)
@@ -603,13 +605,13 @@ void SelectionTerritoire::OnPath()
 					if (strcmp (bitmapPath, "")!=0)
 					{
 						// Check the path
-						if (CheckPath (bitmapPath, path)==false)
+						if (CheckPath (bitmapPath, tStrToUtf8(path))==false)
 						{
 							// Bad path
 							goodPath=false;
 
 							// Make a message
-							sprintf (msg, "Path '%s' can't be found in bitmap '%s'. Continue ?", path, bitmapPath);
+							_stprintf(msg, _T("Path '%s' can't be found in bitmap '%s'. Continue ?"), path, utf8ToTStr(bitmapPath));
 
 							// Message
 							if (MessageBox (msg, _T("TileEdit"), MB_YESNO|MB_ICONQUESTION)==IDNO)
@@ -645,7 +647,7 @@ void SelectionTerritoire::OnPath()
 								if (!bitmapPath.empty())
 								{
 									// Remove the absolute path
-									bool res=RemovePath (bitmapPath, path);
+									bool res=RemovePath (bitmapPath, tStrToUtf8(path));
 									nlassert (res);
 
 									// Set the bitmap
@@ -665,7 +667,7 @@ void SelectionTerritoire::OnPath()
 						if (!bitmapPath.empty())
 						{
 							// Remove the absolute path
-							bool res=RemovePath (bitmapPath, path);
+							bool res=RemovePath (bitmapPath, tStrToUtf8(path));
 							nlassert (res);
 
 							// Set the bitmap
@@ -683,7 +685,7 @@ void SelectionTerritoire::OnPath()
 			if (goodPath)
 			{
 				// Change the abs path of the bank
-				tileBank.setAbsPath (path);
+				tileBank.setAbsPath (tStrToUtf8(path));
 
 				// Change the bouton text
 				GetDlgItem (IDC_PATH)->SetWindowText (path);
@@ -698,9 +700,10 @@ void SelectionTerritoire::OnPath()
 void SelectionTerritoire::OnExport() 
 {
 	// TODO: Add your control notification handler code here
-	static TCHAR BASED_CODE szFilter[] = 
-		_T("NeL tile bank files (*.smallbank)|*.smallbank|All Files (*.*)|*.*||");
- 	CFileDialog sFile(false, _T("*.smallbank"), DefautPath+ _T("*.smallbank"), 0, szFilter, this);
+	static TCHAR BASED_CODE szFilter[] = _T("NeL tile bank files (*.smallbank)|*.smallbank|All Files (*.*)|*.*||");
+
+	CFileDialog sFile(false, _T("*.smallbank"), DefautPath+ _T("*.smallbank"), 0, szFilter, this);
+	
 	if (sFile.DoModal()==IDOK)
 	{
 		// Copy the bank
diff --git a/code/nel/tools/3d/tile_edit/SelectionTerritoire.h b/code/nel/tools/3d/tile_edit/SelectionTerritoire.h
index 600fd9cdb..f38f264d4 100644
--- a/code/nel/tools/3d/tile_edit/SelectionTerritoire.h
+++ b/code/nel/tools/3d/tile_edit/SelectionTerritoire.h
@@ -86,7 +86,7 @@ protected:
 	afx_msg void OnSelchangeTileSet();
 	virtual BOOL OnInitDialog();
 	//}}AFX_MSG
-	void Save(const char* path, NL3D::CTileBank &toSave);
+	void Save(const TCHAR* path, NL3D::CTileBank &toSave);
 
 	DECLARE_MESSAGE_MAP()
 };
diff --git a/code/nel/tools/3d/tile_edit/View.cpp b/code/nel/tools/3d/tile_edit/View.cpp
index 5427f5c2f..cf65a527d 100644
--- a/code/nel/tools/3d/tile_edit/View.cpp
+++ b/code/nel/tools/3d/tile_edit/View.cpp
@@ -227,7 +227,7 @@ int TileList::addTile256 ()
 	return index;
 }
 
-bool RemovePath (std::string& path, const char* absolutePathToRemplace);
+bool RemovePath (std::string& path, const std::string &absolutePathToRemplace);
 
 int TileList::setTile128 (int tile, const std::string& name, NL3D::CTile::TBitmap type)
 {
@@ -240,7 +240,9 @@ int TileList::setTile128 (int tile, const std::string& name, NL3D::CTile::TBitma
 		uint Height;
 		if (!loadPic(tileBank2.getAbsPath ()+troncated, tampon, Width, Height))
 		{
-			return (int)(MessageBox (NULL, ((tileBank2.getAbsPath ()+troncated)+"\nContinue ?").c_str(), _T("Can't load bitmap."), MB_YESNO|MB_ICONEXCLAMATION)==IDYES);
+			std::string msg = tileBank2.getAbsPath() + troncated + "\nContinue ?";
+
+			return (int)(MessageBox (NULL, utf8ToTStr(msg), _T("Can't load bitmap."), MB_YESNO|MB_ICONEXCLAMATION)==IDYES);
 		}
 		else
 		{
@@ -256,10 +258,10 @@ int TileList::setTile128 (int tile, const std::string& name, NL3D::CTile::TBitma
 				error=tileBank2.getTileSet(_tileSet)->checkTile128 (type, border, pixel, composante);
 			if ((error!=CTileSet::ok)&&(error!=CTileSet::addFirstA128128)&&!zouille ())
 			{
-				char sTmp[512];
 				static const char* comp[]={"Red", "Green", "Blue", "Alpha", ""};
-				sprintf (sTmp, "%s\nPixel: %d (%s)", CTileSet::getErrorMessage (error), pixel, comp[composante]);
-				return (int)(MessageBox (NULL, (std::string(sTmp)+"\nContinue ?").c_str(), _T("Can't add tile"), MB_YESNO|MB_ICONEXCLAMATION)==IDYES);
+				std::string msg = NLMISC::toString("%s\nPixel: %d (%s)\nContinue ?", CTileSet::getErrorMessage (error), pixel, comp[composante]);
+
+				return (int)(MessageBox (NULL, utf8ToTStr(msg), _T("Can't add tile"), MB_YESNO|MB_ICONEXCLAMATION)==IDYES);
 			}
 			else
 			{
@@ -286,9 +288,8 @@ int TileList::setTile128 (int tile, const std::string& name, NL3D::CTile::TBitma
 	else
 	{
 		// Error: bitmap not in the absolute path..
-		char msg[512];
-		sprintf (msg, "The bitmap %s is not in the absolute path %s.", name.c_str(), tileBank2.getAbsPath ().c_str());
-		return (int)(MessageBox (NULL, (std::string (msg)+"\nContinue ?").c_str(), _T("Load error"), MB_YESNO|MB_ICONEXCLAMATION)==IDYES);
+		std::string msg = NLMISC::toString("The bitmap %s is not in the absolute path %s.\nContinue ?", name.c_str(), tileBank2.getAbsPath ().c_str());
+		return (int)(MessageBox (NULL, utf8ToTStr(msg), _T("Load error"), MB_YESNO|MB_ICONEXCLAMATION)==IDYES);
 	}
 
 	return 1;
@@ -305,7 +306,8 @@ int TileList::setTile256 (int tile, const std::string& name, NL3D::CTile::TBitma
 		uint Height;
 		if (!loadPic(tileBank2.getAbsPath ()+troncated, tampon, Width, Height))
 		{
-			return (int)(MessageBox (NULL, ((tileBank2.getAbsPath ()+troncated)+"\nContinue ?").c_str(), _T("Can't load bitmap."), MB_YESNO|MB_ICONEXCLAMATION)==IDYES);
+			std::string msg = tileBank2.getAbsPath() + troncated + "\nContinue ?";
+			return (int)(MessageBox (NULL, utf8ToTStr(msg), _T("Can't load bitmap."), MB_YESNO|MB_ICONEXCLAMATION)==IDYES);
 		}
 		else
 		{
@@ -322,10 +324,9 @@ int TileList::setTile256 (int tile, const std::string& name, NL3D::CTile::TBitma
 				error=tileBank2.getTileSet(_tileSet)->checkTile256 (type, border, pixel, composante);
 			if ((error!=CTileSet::ok)&&!zouille())
 			{
-				char sTmp[512];
-				static const char* comp[]={"Red", "Green", "Blue", "Alpha", ""};
-				sprintf (sTmp, "%s\nPixel: %d (%s)", CTileSet::getErrorMessage (error), pixel, comp[composante]);
-				return (int)(MessageBox (NULL, (std::string(sTmp)+"\nContinue ?").c_str(), _T("Can't add tile"), MB_YESNO|MB_ICONEXCLAMATION)==IDYES);
+				static const char* comp[] = { "Red", "Green", "Blue", "Alpha", "" };
+				std::string msg = NLMISC::toString("%s\nPixel: %d (%s)\nContinue ?", CTileSet::getErrorMessage (error), pixel, comp[composante]);
+				return (int)(MessageBox (NULL, utf8ToTStr(msg), _T("Can't add tile"), MB_YESNO|MB_ICONEXCLAMATION)==IDYES);
 			}
 			else
 			{
@@ -349,9 +350,8 @@ int TileList::setTile256 (int tile, const std::string& name, NL3D::CTile::TBitma
 	else
 	{
 		// Error: bitmap not in the absolute path..
-		char msg[512];
-		sprintf (msg, "The bitmap %s is not in the absolute path %s.", name.c_str(), tileBank2.getAbsPath ().c_str());
-		return (int)(MessageBox (NULL, (std::string (msg)+"\nContinue ?").c_str(), _T("Load error"), MB_YESNO|MB_ICONEXCLAMATION)==IDYES);
+		std::string msg = NLMISC::toString("The bitmap %s is not in the absolute path %s.\nContinue ?", name.c_str(), tileBank2.getAbsPath ().c_str());
+		return (int)(MessageBox (NULL, utf8ToTStr(msg), _T("Load error"), MB_YESNO|MB_ICONEXCLAMATION)==IDYES);
 	}
 
 	return 1;
@@ -371,7 +371,8 @@ int TileList::setTileTransition (int tile, const std::string& name, NL3D::CTile:
 		uint Height;
 		if (!loadPic(tileBank2.getAbsPath ()+troncated, tampon, Width, Height))
 		{
-			return (int)(MessageBox (NULL, ((tileBank2.getAbsPath ()+troncated)+"\nContinue ?").c_str(), _T("Can't load bitmap."), MB_YESNO|MB_ICONEXCLAMATION)==IDYES);
+			std::string msg = tileBank2.getAbsPath() + troncated + "\nContinue ?";
+			return (int)(MessageBox (NULL, utf8ToTStr(msg), _T("Can't load bitmap."), MB_YESNO|MB_ICONEXCLAMATION)==IDYES);
 		}
 		else
 		{
@@ -387,10 +388,9 @@ int TileList::setTileTransition (int tile, const std::string& name, NL3D::CTile:
 				error=tileBank2.getTileSet(_tileSet)->checkTile128 (type, border, pixel, composante);
 			if ((error!=CTileSet::ok)&&(error!=CTileSet::addFirstA128128)&&!zouille ())
 			{
-				char sTmp[512];
 				static const char* comp[]={"Red", "Green", "Blue", "Alpha", ""};
-				sprintf (sTmp, "%s\nPixel: %d (%s)", CTileSet::getErrorMessage (error), pixel, comp[composante]);
-				return MessageBox (NULL, (std::string(sTmp)+"\nContinue ?").c_str(), _T("Can't add tile"), MB_YESNO|MB_ICONEXCLAMATION)==IDYES;
+				std::string msg = NLMISC::toString("%s\nPixel: %d (%s)\nContinue ?", CTileSet::getErrorMessage(error), pixel, comp[composante]);
+				return MessageBox (NULL, utf8ToTStr(msg), _T("Can't add tile"), MB_YESNO|MB_ICONEXCLAMATION)==IDYES;
 			}
 			else
 			{
@@ -437,14 +437,17 @@ int TileList::setDisplacement (int tile, const std::string& name)
 			theListDisplacement[tile].loaded=0;
 
 			if (!_LoadBitmap(tileBank2.getAbsPath() + troncated, &theListDisplacement[tile].BmpInfo, theListDisplacement[tile].Bits, NULL, 0))
-				MessageBox (NULL, (tileBank2.getAbsPath() + troncated).c_str(), _T("Can't load file"), MB_OK|MB_ICONEXCLAMATION);
+			{
+				std::string msg = tileBank2.getAbsPath() + troncated;
+				MessageBox(NULL, utf8ToTStr(msg), _T("Can't load file"), MB_OK | MB_ICONEXCLAMATION);
+			}
 			else
 			{
 				// Check the size
 				if ((theListDisplacement[tile].BmpInfo.bmiHeader.biWidth!=32)||(-theListDisplacement[tile].BmpInfo.bmiHeader.biHeight!=32))
 				{
 					// Error message
-					MessageBox (NULL, _T("Invalid size: displacement map must be 32x32 8 bits."), troncated.c_str(),
+					MessageBox (NULL, _T("Invalid size: displacement map must be 32x32 8 bits."), utf8ToTStr(troncated),
 						MB_OK|MB_ICONEXCLAMATION);
 
 					// Free the bitmap
@@ -464,9 +467,8 @@ int TileList::setDisplacement (int tile, const std::string& name)
 	else
 	{
 		// Error: bitmap not in the absolute path..
-		char msg[512];
-		sprintf (msg, "The bitmap %s is not in the absolute path %s.", name.c_str(), tileBank2.getAbsPath ().c_str());
-		MessageBox (NULL, msg, _T("Load error"), MB_OK|MB_ICONEXCLAMATION);
+		std::string msg = NLMISC::toString("The bitmap %s is not in the absolute path %s.", name.c_str(), tileBank2.getAbsPath ().c_str());
+		MessageBox (NULL, utf8ToTStr(msg), _T("Load error"), MB_OK|MB_ICONEXCLAMATION);
 	}
 
 	return 1;
@@ -483,7 +485,8 @@ int TileList::setTileTransitionAlpha (int tile, const std::string& name, int rot
 		uint Height;
 		if (!loadPic(tileBank2.getAbsPath ()+troncated, tampon, Width, Height))
 		{
-			return MessageBox (NULL, ((tileBank2.getAbsPath ()+troncated)+"\nContinue ?").c_str(), _T("Can't load bitmap."), MB_YESNO|MB_ICONEXCLAMATION)==IDYES;
+			std::string msg = tileBank2.getAbsPath() + troncated + "\nContinue ?";
+			return MessageBox (NULL, utf8ToTStr(msg), _T("Can't load bitmap."), MB_YESNO|MB_ICONEXCLAMATION)==IDYES;
 		}
 		else
 		{
@@ -505,23 +508,27 @@ int TileList::setTileTransitionAlpha (int tile, const std::string& name, int rot
 			if (((error=tileBank2.getTileSet(_tileSet)->checkTileTransition ((CTileSet::TTransition)tile, CTile::alpha, border, indexError,
 				pixel, composante))!=CTileSet::ok)&&!zouille ())
 			{
-				char sMsg[512];
+				std::string msg;
 				if ((error==CTileSet::topInterfaceProblem)||(error==CTileSet::bottomInterfaceProblem)||(error==CTileSet::leftInterfaceProblem)
 					||(error==CTileSet::rightInterfaceProblem)||(error==CTileSet::topBottomNotTheSame)||(error==CTileSet::rightLeftNotTheSame)
 					||(error==CTileSet::topInterfaceProblem))
 				{
 					static const char* comp[]={"Red", "Green", "Blue", "Alpha", ""};
 					if (indexError!=-1)
-						sprintf (sMsg, "%s\nIncompatible with tile nb %d\nPixel: %d (%s)", CTileSet::getErrorMessage (error), indexError,
+						msg = NLMISC::toString("%s\nIncompatible with tile nb %d\nPixel: %d (%s)", CTileSet::getErrorMessage (error), indexError,
 							pixel, comp[composante]);
 					else
-						sprintf (sMsg, "%s\nIncompatible with the 128x128 tile\nPixel: %d (%s)", CTileSet::getErrorMessage (error),
+						msg = NLMISC::toString("%s\nIncompatible with the 128x128 tile\nPixel: %d (%s)", CTileSet::getErrorMessage (error),
 							pixel, comp[composante]);
 				}
 				else
-					sprintf (sMsg, "%s\nIncompatible filled tile", CTileSet::getErrorMessage (error));
+				{
+					msg = NLMISC::toString("%s\nIncompatible filled tile", CTileSet::getErrorMessage(error));
+				}
+
+				msg += "\nContinue ?";
 				
-				return MessageBox (NULL, (std::string(sMsg)+"\nContinue ?").c_str(), _T("Can't add tile"), MB_YESNO|MB_ICONEXCLAMATION)==IDYES;
+				return MessageBox (NULL, utf8ToTStr(msg), _T("Can't add tile"), MB_YESNO|MB_ICONEXCLAMATION)==IDYES;
 			}
 			else
 			{
@@ -534,8 +541,8 @@ int TileList::setTileTransitionAlpha (int tile, const std::string& name, int rot
 	else
 	{
 		// Error: bitmap not in the absolute path..
-		char msg[512];
-		sprintf (msg, "The bitmap %s is not in the absolute path %s.", name.c_str(), tileBank2.getAbsPath ().c_str());
+		TCHAR msg[512];
+		_stprintf(msg, _T("The bitmap %s is not in the absolute path %s."), utf8ToTStr(name), utf8ToTStr(tileBank2.getAbsPath ()));
 		MessageBox (NULL, msg, _T("Load error"), MB_OK|MB_ICONEXCLAMATION);
 	}
 
diff --git a/code/nel/tools/3d/tile_edit/ViewColumn.cpp b/code/nel/tools/3d/tile_edit/ViewColumn.cpp
index d060b6788..db69b11dc 100644
--- a/code/nel/tools/3d/tile_edit/ViewColumn.cpp
+++ b/code/nel/tools/3d/tile_edit/ViewColumn.cpp
@@ -19,10 +19,36 @@
 #include "ViewColumn.h"
 #include "Browse.h"
 
-char *WndRegKeys[4][5] = {{"POPUP BOTTOM RX","POPUP BOTTOM RY","POPUP BOTTOM CX","POPUP BOTTOM CY","POPUP BOTTOM N"},
-						{"POPUP TOP RX","POPUP TOP RY","POPUP TOP CX","POPUP TOP CY","POPUP TOP N"},
-						{"POPUP LEFT RX","POPUP LEFT RY","POPUP LEFT CX","POPUP LEFT CY","POPUP LEFT N"},
-						{"POPUP RIGHT RX","POPUP RIGHT RY","POPUP RIGHT CX","POPUP RIGHT CY","POPUP RIGHT N"}};
+TCHAR *WndRegKeys[4][5] = {
+	{
+		_T("POPUP BOTTOM RX"),
+		_T("POPUP BOTTOM RY"),
+		_T("POPUP BOTTOM CX"),
+		_T("POPUP BOTTOM CY"),
+		_T("POPUP BOTTOM N")
+	},
+	{
+		_T("POPUP TOP RX"),
+		_T("POPUP TOP RY"),
+		_T("POPUP TOP CX"),
+		_T("POPUP TOP CY"),
+		_T("POPUP TOP N")
+	},
+	{
+		_T("POPUP LEFT RX"),
+		_T("POPUP LEFT RY"),
+		_T("POPUP LEFT CX"),
+		_T("POPUP LEFT CY"),
+		_T("POPUP LEFT N")
+	},
+	{
+		_T("POPUP RIGHT RX"),
+		_T("POPUP RIGHT RY"),
+		_T("POPUP RIGHT CX"),
+		_T("POPUP RIGHT CY"),
+		_T("POPUP RIGHT N")
+	}
+};
 
 /////////////////////////////////////////////////////////////////////////////
 // ViewColumn dialog
@@ -164,11 +190,11 @@ BOOL ViewColumn::OnInitDialog()
 	if (RegOpenKey(HKEY_CURRENT_USER,REGKEY_TILEDIT,&regkey)==ERROR_SUCCESS)
 	{
 		unsigned long value; 
-		RegQueryValueEx(regkey,WndRegKeys[pos&3][0],0,&value,(unsigned char *)&rx,&value);
-		RegQueryValueEx(regkey,WndRegKeys[pos&3][1],0,&value,(unsigned char *)&ry,&value);
-		RegQueryValueEx(regkey,WndRegKeys[pos&3][2],0,&value,(unsigned char *)&cx,&value);
-		RegQueryValueEx(regkey,WndRegKeys[pos&3][3],0,&value,(unsigned char *)&cy,&value);		
-		RegQueryValueEx(regkey,WndRegKeys[pos&3][4],0,&value,(unsigned char *)&nTileInWnd,&value);
+		RegQueryValueEx(regkey, WndRegKeys[pos&3][0], 0, &value, (LPBYTE)&rx, &value);
+		RegQueryValueEx(regkey, WndRegKeys[pos&3][1], 0, &value, (LPBYTE)&ry, &value);
+		RegQueryValueEx(regkey, WndRegKeys[pos&3][2], 0, &value, (LPBYTE)&cx, &value);
+		RegQueryValueEx(regkey, WndRegKeys[pos&3][3], 0, &value, (LPBYTE)&cy, &value);
+		RegQueryValueEx(regkey, WndRegKeys[pos&3][4], 0, &value, (LPBYTE)&nTileInWnd, &value);
 		RegCloseKey(regkey);
 	}
 	EnableScrollBar(SB_VERT);
@@ -378,9 +404,9 @@ void ViewColumn::OnRButtonDown(UINT nFlags, CPoint point)
 	// TODO: Add your message handler code here and/or call default
 	CMenu popup;
 	popup.CreatePopupMenu();
-	popup.AppendMenu(MF_STRING | (nTileInWnd==1?MF_CHECKED:0),10,"*1");
-	popup.AppendMenu(MF_STRING | (nTileInWnd==4?MF_CHECKED:0),12,"*4");
-	popup.AppendMenu(MF_STRING,13,"Replace window");
+	popup.AppendMenu(MF_STRING | (nTileInWnd == 1 ? MF_CHECKED:0), 10, _T("*1"));
+	popup.AppendMenu(MF_STRING | (nTileInWnd == 4 ? MF_CHECKED:0), 12, _T("*4"));
+	popup.AppendMenu(MF_STRING, 13, _T("Replace window"));
 	
 	RECT rect; GetWindowRect(&rect);
 	popup.TrackPopupMenu(TPM_LEFTALIGN,MousePos.x+rect.left,MousePos.y+rect.top,this,NULL);
diff --git a/code/nel/tools/3d/tile_edit/ViewColumn.h b/code/nel/tools/3d/tile_edit/ViewColumn.h
index 78455fce2..e079c8fc0 100644
--- a/code/nel/tools/3d/tile_edit/ViewColumn.h
+++ b/code/nel/tools/3d/tile_edit/ViewColumn.h
@@ -23,7 +23,7 @@
 // ViewColumn.h : header file
 //
 
-extern char *WndRegKeys[4][5];
+extern TCHAR *WndRegKeys[4][5];
 
 #include "View.h"
 
diff --git a/code/nel/tools/3d/tile_edit/custom.cpp b/code/nel/tools/3d/tile_edit/custom.cpp
index e33ac3b0f..d7b4f8173 100644
--- a/code/nel/tools/3d/tile_edit/custom.cpp
+++ b/code/nel/tools/3d/tile_edit/custom.cpp
@@ -97,7 +97,7 @@ LRESULT Custom::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
 		{
 			CString str;
 			clist->GetLBText(i+2,str);
-			buttonList[i].Create((LPCSTR)str,BS_CHECKBOX,button,this,i+10);
+			buttonList[i].Create(str,BS_CHECKBOX,button,this,i+10);
 			buttonList[i].SetFont(&font,1);
 			buttonList[i].ModifyStyle(0,WS_VISIBLE);
 /*			RECT st = button; st.left+=20; st.right = client.right - 90; st.top -= 3;
diff --git a/code/nel/tools/logic/logic_editor_dll/logic_editor_interface.h b/code/nel/tools/logic/logic_editor_dll/logic_editor_interface.h
index f2ac7c13a..d0059571c 100644
--- a/code/nel/tools/logic/logic_editor_dll/logic_editor_interface.h
+++ b/code/nel/tools/logic/logic_editor_dll/logic_editor_interface.h
@@ -17,6 +17,8 @@
 #ifndef LOGIC_EDITOR_INTERFACE
 #define LOGIC_EDITOR_INTERFACE
 
+#include <tchar.h>
+
 #ifndef LOGIC_EDITOR_EXPORT
 #define LOGIC_EDITOR_EXPORT __declspec( dllimport ) 
 #endif // LOGIC_EDITOR_EXPORT
diff --git a/code/nel/tools/misc/branch_patcher/branch_patcherDlg.cpp b/code/nel/tools/misc/branch_patcher/branch_patcherDlg.cpp
index c27111935..134eddebf 100644
--- a/code/nel/tools/misc/branch_patcher/branch_patcherDlg.cpp
+++ b/code/nel/tools/misc/branch_patcher/branch_patcherDlg.cpp
@@ -208,7 +208,6 @@ int CDirDialog::DoBrowse()
 	}
 
 	BROWSEINFO bInfo;
-	LPITEMIDLIST pidl;
 	ZeroMemory((PVOID)&bInfo, sizeof(BROWSEINFO));
 
 	if (!m_strInitDir.IsEmpty())
@@ -258,10 +257,8 @@ int CDirDialog::DoBrowse()
 	bInfo.lpszTitle = (m_strTitle.IsEmpty()) ? "Open" : m_strTitle;
 	bInfo.ulFlags = BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;
 
-	if ((pidl = ::SHBrowseForFolder(&bInfo)) == NULL)
-	{
-		return 0;
-	}
+	PIDLIST_ABSOLUTE pidl = ::SHBrowseForFolder(&bInfo);
+	if (!pidl) return 0;
 
 	m_strPath.ReleaseBuffer();
 	m_iImageIndex = bInfo.iImage;
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/actions.xml b/code/ryzom/client/data/gamedev/interfaces_v3/actions.xml
index d628a6996..42c931e29 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/actions.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/actions.xml
@@ -235,6 +235,7 @@
 			<value value="guild"	   hardtext="uimMtGuild" />
 		</parameter>
 	</action>
+	<action name="inv_temp_all" hardtext="uittTakeAll" contexts="game" />
 </action_category>
 
 <action_category name="chat" hardtext="uiChat" contexts="game, r2ed, r2ed_anim_test"> <!-- not available in r2ed for now -->
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/commands.xml b/code/ryzom/client/data/gamedev/interfaces_v3/commands.xml
index d7aabccae..31a1a7099 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/commands.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/commands.xml
@@ -120,6 +120,8 @@
 	<command name="showonline" action="command" params="a showOnline $"/>
 	<command name="showOnline" action="command" params="a showOnline $"/>
 
+	<command name="loot" action="inv_temp_all" params="" />
+
 	<!-- WebIG -->
 	<command name="go" action="browse" params="name=ui:interface:webig:content:html|url=home"/>
 	<command name="webdev" action="browse" params="name=ui:interface:webig:content:html|url=http://localhost/index.html"/>
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/keys.xml b/code/ryzom/client/data/gamedev/interfaces_v3/keys.xml
index ae212a589..40ecd1c75 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/keys.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/keys.xml
@@ -278,6 +278,7 @@
   <key name="KeyB" action="show_hide" params="phrase_book" /> 
   <key name="N/A" action="show_hide" params="gestionsets" /> 
   <key name="KeyP" shift="1" action="show_hide" params="animal_global" /> 
+  <key name="N/A" action="inv_temp_all" params="" />
   
   
   <!--  Map
diff --git a/code/ryzom/client/src/character_cl.cpp b/code/ryzom/client/src/character_cl.cpp
index 22632899a..4efe4c129 100644
--- a/code/ryzom/client/src/character_cl.cpp
+++ b/code/ryzom/client/src/character_cl.cpp
@@ -8481,7 +8481,7 @@ void CCharacterCL::displayDebugPropertyStages(float x, float &y, float lineStep)
 // readWrite :
 // Read/Write Variables from/to the stream.
 //---------------------------------------------------
-void CCharacterCL::readWrite(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CCharacterCL::readWrite(NLMISC::IStream &f)
 {
 	CEntityCL::readWrite(f);
 
diff --git a/code/ryzom/client/src/character_cl.h b/code/ryzom/client/src/character_cl.h
index 0a65a67c9..6c12830f8 100644
--- a/code/ryzom/client/src/character_cl.h
+++ b/code/ryzom/client/src/character_cl.h
@@ -949,7 +949,7 @@ protected:
 
 
 	// Read/Write Variables from/to the stream.
-	virtual void readWrite(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void readWrite(NLMISC::IStream &f);
 	// To call after a read from a stream to re-initialize the entity.
 	virtual void load();
 
diff --git a/code/ryzom/client/src/client.cpp b/code/ryzom/client/src/client.cpp
index 4ad8ba6af..2c894a65e 100644
--- a/code/ryzom/client/src/client.cpp
+++ b/code/ryzom/client/src/client.cpp
@@ -205,6 +205,19 @@ int main(int argc, char **argv)
 		{
 			LoginPassword = Args.getAdditionalArg("password").front();
 
+			// password in hexadecimal
+			if (LoginPassword.compare(0, 2, "0x") == 0)
+			{
+				std::string decodedPassword;
+
+				// decode password
+				if (fromHexa(LoginPassword.substr(2), decodedPassword))
+				{
+					// only use it if real hexadecimal
+					LoginPassword = decodedPassword;
+				}
+			}
+
 			if (Args.haveAdditionalArg("shard_id"))
 				sLoginShardId = Args.getAdditionalArg("shard_id").front();
 		}
diff --git a/code/ryzom/client/src/client_cfg.cpp b/code/ryzom/client/src/client_cfg.cpp
index 8d61f3a8c..c5bc0e585 100644
--- a/code/ryzom/client/src/client_cfg.cpp
+++ b/code/ryzom/client/src/client_cfg.cpp
@@ -1855,7 +1855,7 @@ void CClientConfig::setValues()
 // serial :
 // Serialize CFG.
 //-----------------------------------------------
-void CClientConfig::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CClientConfig::serial(NLMISC::IStream &f)
 {
 	// Start the opening of a new node named ClientCFG.
 	f.xmlPush("ClientCFG");
diff --git a/code/ryzom/client/src/client_cfg.h b/code/ryzom/client/src/client_cfg.h
index dd150dd49..4d4d746e0 100644
--- a/code/ryzom/client/src/client_cfg.h
+++ b/code/ryzom/client/src/client_cfg.h
@@ -831,7 +831,7 @@ public:
 	static void setValuesOnFileChange ();	// called when cfg modified
 
 	/// Serialize CFG.
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 
 	/// End process
 	void release ();
diff --git a/code/ryzom/client/src/client_sheets/animation_fx_set_sheet.cpp b/code/ryzom/client/src/client_sheets/animation_fx_set_sheet.cpp
index be688e6b5..d881c8f0b 100644
--- a/code/ryzom/client/src/client_sheets/animation_fx_set_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/animation_fx_set_sheet.cpp
@@ -56,7 +56,7 @@ void CAnimationFXSetSheet::buildWithPrefix(const NLGEORGES::UFormElm &item, cons
 }
 
 // ****************************************************************************************************
-void CAnimationFXSetSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CAnimationFXSetSheet::serial(NLMISC::IStream &f)
 {
 	f.serialCont(FX);
 	for(uint k = 0; k < MaxNumFX; ++k)
diff --git a/code/ryzom/client/src/client_sheets/animation_fx_set_sheet.h b/code/ryzom/client/src/client_sheets/animation_fx_set_sheet.h
index e5e1ba9fa..019ddeecf 100644
--- a/code/ryzom/client/src/client_sheets/animation_fx_set_sheet.h
+++ b/code/ryzom/client/src/client_sheets/animation_fx_set_sheet.h
@@ -46,7 +46,7 @@ public:
 	// from CEntitySheet
 	void build(const NLGEORGES::UFormElm &item);
 	/// Serialize sheet into binary data file.
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 };
 
 
diff --git a/code/ryzom/client/src/client_sheets/animation_fx_sheet.cpp b/code/ryzom/client/src/client_sheets/animation_fx_sheet.cpp
index 7a70b467c..f5a84490d 100644
--- a/code/ryzom/client/src/client_sheets/animation_fx_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/animation_fx_sheet.cpp
@@ -92,7 +92,7 @@ void CAnimationFXSheet::build(const NLGEORGES::UFormElm &item)
 //-----------------------------------------------
 // serial
 //-----------------------------------------------
-void CAnimationFXSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CAnimationFXSheet::serial(NLMISC::IStream &f)
 {
 	f.serial(PSName);
 	f.serial(StickMode);
diff --git a/code/ryzom/client/src/client_sheets/animation_fx_sheet.h b/code/ryzom/client/src/client_sheets/animation_fx_sheet.h
index cf02157a4..0e416fe20 100644
--- a/code/ryzom/client/src/client_sheets/animation_fx_sheet.h
+++ b/code/ryzom/client/src/client_sheets/animation_fx_sheet.h
@@ -60,7 +60,7 @@ public:
 	/// Build the fx from an external script.
 	void build(const NLGEORGES::UFormElm &item, const std::string &prefix);
 	/// Serialize a CAnimationFX.
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 };
 
 
diff --git a/code/ryzom/client/src/client_sheets/animation_set_list_sheet.cpp b/code/ryzom/client/src/client_sheets/animation_set_list_sheet.cpp
index 618c9da35..69ea921fd 100644
--- a/code/ryzom/client/src/client_sheets/animation_set_list_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/animation_set_list_sheet.cpp
@@ -310,7 +310,7 @@ void CAnimationSheet::build(const NLGEORGES::UFormElm &item)
 //-----------------------------------------------
 // serial
 //-----------------------------------------------
-void CAnimationSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CAnimationSheet::serial(NLMISC::IStream &f)
 {
 	// serialize the animation name to be able to compute the animation when loading.
 	AnimNames.serial(f, IdAnim);
@@ -474,7 +474,7 @@ void CAnimationStateSheet::build(const NLGEORGES::UFormElm &item)
 //-----------------------------------------------
 // serial
 //-----------------------------------------------
-void CAnimationStateSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CAnimationStateSheet::serial(NLMISC::IStream &f)
 {
 	// Vector of animation.
 	f.serialCont(Animations);
@@ -600,7 +600,7 @@ void CAnimationSetSheet::build(const NLGEORGES::UFormElm &rootElmt)
 // serial :
 // serialize to disk or from disk the content of this class
 //-----------------------------------------------
-void CAnimationSetSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CAnimationSetSheet::serial(NLMISC::IStream &f)
 {
 	f.serial(Name);
 	f.serialCont(AnimationStates);
@@ -723,7 +723,7 @@ void CAnimationSetListSheet::build(const NLGEORGES::UFormElm &item)
 // serial :
 // serialize to disk or from disk the content of this class
 //-----------------------------------------------
-void CAnimationSetListSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CAnimationSetListSheet::serial(NLMISC::IStream &f)
 {
 	f.serialCont(AnimSetList);
 }// serial //
diff --git a/code/ryzom/client/src/client_sheets/animation_set_list_sheet.h b/code/ryzom/client/src/client_sheets/animation_set_list_sheet.h
index b75c213ba..304d8b72e 100644
--- a/code/ryzom/client/src/client_sheets/animation_set_list_sheet.h
+++ b/code/ryzom/client/src/client_sheets/animation_set_list_sheet.h
@@ -91,7 +91,7 @@ public:
 	void build(const NLGEORGES::UFormElm &item);
 
 	/// Serialize sheet into binary data file.
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 };
 
@@ -300,7 +300,7 @@ public:
 	void build(const NLGEORGES::UFormElm &item);
 
 	/// Serialize sheet into binary data file.
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 };
 
@@ -331,7 +331,7 @@ public:
 	void build(const NLGEORGES::UFormElm &item);
 
 	/// Serialize sheet into binary data file.
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 };
 
@@ -353,7 +353,7 @@ public:
 	virtual void build(const NLGEORGES::UFormElm &item);
 
 	/// Serialize sheet into binary data file.
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 
 };
 
diff --git a/code/ryzom/client/src/client_sheets/attack_id_sheet.cpp b/code/ryzom/client/src/client_sheets/attack_id_sheet.cpp
index d990162ec..4ad810fa4 100644
--- a/code/ryzom/client/src/client_sheets/attack_id_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/attack_id_sheet.cpp
@@ -58,7 +58,7 @@ void CAttackIDSheet::build(const NLGEORGES::UFormElm &item, const std::string &p
 }
 
 // *****************************************************************************************
-void CAttackIDSheet::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CAttackIDSheet::serial(NLMISC::IStream &f)
 {
 	f.serialEnum(Type);
 	switch(Type)
@@ -96,7 +96,7 @@ void CAttackIDSheet::CSpellInfo::build(const NLGEORGES::UFormElm &item, const st
 }
 
 // *****************************************************************************************
-void CAttackIDSheet::CSpellInfo::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CAttackIDSheet::CSpellInfo::serial(NLMISC::IStream &f)
 {
 	f.serialEnum(Mode);
 	f.serialEnum(ID);
diff --git a/code/ryzom/client/src/client_sheets/attack_id_sheet.h b/code/ryzom/client/src/client_sheets/attack_id_sheet.h
index 1dfe1b790..42b678a13 100644
--- a/code/ryzom/client/src/client_sheets/attack_id_sheet.h
+++ b/code/ryzom/client/src/client_sheets/attack_id_sheet.h
@@ -41,7 +41,7 @@ public:
 		MAGICFX::TMagicFx   ID;
 	public:
 		void build(const NLGEORGES::UFormElm &item, const std::string &prefix);
-		void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+		void serial(NLMISC::IStream &f);
 	};
 public:
 	TType				  Type;
@@ -54,7 +54,7 @@ public:
 	};
 public:
 	virtual void build(const NLGEORGES::UFormElm &item, const std::string &prefix);
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 };
 
 // compares spell infos
diff --git a/code/ryzom/client/src/client_sheets/attack_list_sheet.cpp b/code/ryzom/client/src/client_sheets/attack_list_sheet.cpp
index e398a3bb8..022b64777 100644
--- a/code/ryzom/client/src/client_sheets/attack_list_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/attack_list_sheet.cpp
@@ -37,7 +37,7 @@ void CAttackListSheetEntry::build(const NLGEORGES::UFormElm &item, const std::st
 }
 
 // *******************************************************************************************
-void CAttackListSheetEntry::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CAttackListSheetEntry::serial(NLMISC::IStream &f)
 {
 	f.serial(ID);
 	f.serial(Attack);
@@ -65,7 +65,7 @@ void CAttackListSheet::build(const NLGEORGES::UFormElm &item)
 }
 
 // *******************************************************************************************
-void CAttackListSheet::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CAttackListSheet::serial(NLMISC::IStream &f)
 {
 	f.serialCont(Attacks);
 }
diff --git a/code/ryzom/client/src/client_sheets/attack_list_sheet.h b/code/ryzom/client/src/client_sheets/attack_list_sheet.h
index 434ca2f19..6e0df06aa 100644
--- a/code/ryzom/client/src/client_sheets/attack_list_sheet.h
+++ b/code/ryzom/client/src/client_sheets/attack_list_sheet.h
@@ -32,7 +32,7 @@ public:
 	CAttackSheet   Attack;
 public:
 	void build(const NLGEORGES::UFormElm &item, const std::string &prefix);
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 };
 
 
@@ -49,7 +49,7 @@ public:
 public:
 	CAttackListSheet();
 	virtual void build(const NLGEORGES::UFormElm &item);
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 };
 
 
diff --git a/code/ryzom/client/src/client_sheets/attack_sheet.cpp b/code/ryzom/client/src/client_sheets/attack_sheet.cpp
index f65bf818b..8fd19ec53 100644
--- a/code/ryzom/client/src/client_sheets/attack_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/attack_sheet.cpp
@@ -72,7 +72,7 @@ void CAttackSheet::build(const NLGEORGES::UFormElm &item, const std::string &pre
 }
 
 // *********************************************************************************************************
-void CAttackSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CAttackSheet::serial(NLMISC::IStream &f)
 {
 	f.serialEnum(ProjectileMode);
 	f.serial(AttackBeginFX);
diff --git a/code/ryzom/client/src/client_sheets/attack_sheet.h b/code/ryzom/client/src/client_sheets/attack_sheet.h
index 1b16a76a2..7db587a3a 100644
--- a/code/ryzom/client/src/client_sheets/attack_sheet.h
+++ b/code/ryzom/client/src/client_sheets/attack_sheet.h
@@ -57,7 +57,7 @@ public:
 	// ctor
 	CAttackSheet();
 	virtual void build(const NLGEORGES::UFormElm &item, const std::string &prefix);
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 };
 
 
diff --git a/code/ryzom/client/src/client_sheets/automaton_list_sheet.cpp b/code/ryzom/client/src/client_sheets/automaton_list_sheet.cpp
index 1f0b6565c..013847fa2 100644
--- a/code/ryzom/client/src/client_sheets/automaton_list_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/automaton_list_sheet.cpp
@@ -250,7 +250,7 @@ void CAutomatonStateSheet::build(const NLGEORGES::UFormElm &item, const string &
 // serial :
 // Serialize a CAutomatonStateSheet.
 //-----------------------------------------------
-void CAutomatonStateSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CAutomatonStateSheet::serial(NLMISC::IStream &f)
 {
 	f.serialEnum(MoveState);
 	f.serialEnum(NextState);
@@ -402,7 +402,7 @@ void CAutomatonSheet::build(const NLGEORGES::UFormElm &item)
 
 //-----------------------------------------------
 //-----------------------------------------------
-void CAutomatonSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CAutomatonSheet::serial(NLMISC::IStream &f)
 {
 	f.serialCont(_States);
 }// serial //
@@ -540,7 +540,7 @@ void CAutomatonListSheet::build(const NLGEORGES::UFormElm &rootList)
 // version 1 : base  version
 
 //-----------------------------------------------
-void CAutomatonListSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CAutomatonListSheet::serial(NLMISC::IStream &f)
 {
 	if (f.isReading())
 	{
diff --git a/code/ryzom/client/src/client_sheets/automaton_list_sheet.h b/code/ryzom/client/src/client_sheets/automaton_list_sheet.h
index 6bd629b64..7faa0de0e 100644
--- a/code/ryzom/client/src/client_sheets/automaton_list_sheet.h
+++ b/code/ryzom/client/src/client_sheets/automaton_list_sheet.h
@@ -60,7 +60,7 @@ public:
 		}
 
 		/// Serialize a CNextStateInf.
-		void serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+		void serial(NLMISC::IStream &f)
 		{
 			f.serialEnum (NextStateKey);
 			f.serial(Breakable);
@@ -151,7 +151,7 @@ public:
 	void build(const NLGEORGES::UFormElm &item, const std::string &baseKeyStr);
 
 	/// Serialize a CMovingAutomatonState.
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 	/** Return if there is a connection with the mode in parameter from the current automaton and filled the transition to use.
 	 * \param mode : is there a connection for this mode.
@@ -182,7 +182,7 @@ public:
 	void build(const NLGEORGES::UFormElm &item);
 
 	/// Serialize sheet into binary data file.
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 	/**
 	 * Return a pointer on the information about the state corresponding to the key.
@@ -227,7 +227,7 @@ public:
 	virtual void build(const NLGEORGES::UFormElm &item);
 
 	/// Serialize sheet into binary data file.
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 
 	/// Tool to read a dfn composed with an array of string
 	static void readDfnStringArray(std::vector<std::string> &states, const std::string &dfnName);
diff --git a/code/ryzom/client/src/client_sheets/body_to_bone_sheet.cpp b/code/ryzom/client/src/client_sheets/body_to_bone_sheet.cpp
index fb065e6df..d606a028a 100644
--- a/code/ryzom/client/src/client_sheets/body_to_bone_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/body_to_bone_sheet.cpp
@@ -61,7 +61,7 @@ void CBodyToBoneSheet::build(const NLGEORGES::UFormElm &item, const std::string
 }
 
 // *********************************************************************************************
-void CBodyToBoneSheet::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CBodyToBoneSheet::serial(NLMISC::IStream &f)
 {
 	ClientSheetsStrings.serial(f, Head);
 	ClientSheetsStrings.serial(f, Chest);
diff --git a/code/ryzom/client/src/client_sheets/body_to_bone_sheet.h b/code/ryzom/client/src/client_sheets/body_to_bone_sheet.h
index 10e59ba72..0c9110d48 100644
--- a/code/ryzom/client/src/client_sheets/body_to_bone_sheet.h
+++ b/code/ryzom/client/src/client_sheets/body_to_bone_sheet.h
@@ -52,7 +52,7 @@ public:
 	CBodyToBoneSheet();
 	// build that an external script
 	void build(const NLGEORGES::UFormElm &item, const std::string &prefix);
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 	/** From a body part and a side, retrieves bone name (or NULL if none).
 	  * The side is meaningless for part such as 'chest'
 	  */
diff --git a/code/ryzom/client/src/client_sheets/building_sheet.cpp b/code/ryzom/client/src/client_sheets/building_sheet.cpp
index 06abbf87d..1f1fdfba5 100644
--- a/code/ryzom/client/src/client_sheets/building_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/building_sheet.cpp
@@ -69,7 +69,7 @@ void CBuildingSheet::build(const NLGEORGES::UFormElm &item)
 // serial :
 // Serialize character sheet into binary data file.
 //-----------------------------------------------
-void CBuildingSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CBuildingSheet::serial(NLMISC::IStream &f)
 {
 	// Serialize class components.
 	f.serial(BuildedIg);
diff --git a/code/ryzom/client/src/client_sheets/building_sheet.h b/code/ryzom/client/src/client_sheets/building_sheet.h
index 98b7211d2..2ccf941b1 100644
--- a/code/ryzom/client/src/client_sheets/building_sheet.h
+++ b/code/ryzom/client/src/client_sheets/building_sheet.h
@@ -55,7 +55,7 @@ public:
 	virtual void build(const NLGEORGES::UFormElm &item);
 
 	/// Serialize character sheet into binary data file.
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 };
 
 
diff --git a/code/ryzom/client/src/client_sheets/character_sheet.cpp b/code/ryzom/client/src/client_sheets/character_sheet.cpp
index 0da928768..ab935268b 100644
--- a/code/ryzom/client/src/client_sheets/character_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/character_sheet.cpp
@@ -658,7 +658,7 @@ void CCharacterSheet::build(const NLGEORGES::UFormElm &item)
 // serial :
 // Serialize character sheet into binary data file.
 //-----------------------------------------------
-void CCharacterSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CCharacterSheet::serial(NLMISC::IStream &f)
 {
 	// Serialize class components.
 //	ClientSheetsStrings.serial(f, IdFirstName);
diff --git a/code/ryzom/client/src/client_sheets/character_sheet.h b/code/ryzom/client/src/client_sheets/character_sheet.h
index 119baf195..39221eaad 100644
--- a/code/ryzom/client/src/client_sheets/character_sheet.h
+++ b/code/ryzom/client/src/client_sheets/character_sheet.h
@@ -84,7 +84,7 @@ public:
 		std::string	getBindPoint() const { return ClientSheetsStrings.get(IdBindPoint); }
 
 		/// Serialize character sheet into binary data file.
-		virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+		virtual void serial(NLMISC::IStream &f)
 		{
 
 			ClientSheetsStrings.serial(f, IdItem);
@@ -208,7 +208,7 @@ public:
 	public:
 		NLMISC::CVector Origin;
 		NLMISC::CVector Pos;
-		void serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+		void serial(NLMISC::IStream &f)
 		{
 			f.serial(Origin);
 			f.serial(Pos);
@@ -234,7 +234,7 @@ public:
 	virtual void build(const NLGEORGES::UFormElm &item);
 
 	/// Serialize character sheet into binary data file.
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 
 	/// Return the list of all equipement possibles (body... + HairList). Pointers should be used localy
 	void	getWholeEquipmentList(std::vector<const CEquipment*> &equipList) const;
diff --git a/code/ryzom/client/src/client_sheets/continent_sheet.cpp b/code/ryzom/client/src/client_sheets/continent_sheet.cpp
index 17868866c..aa2bdb142 100644
--- a/code/ryzom/client/src/client_sheets/continent_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/continent_sheet.cpp
@@ -334,7 +334,7 @@ void CContinentParameters::buildFogMapBuild(const NLGEORGES::UFormElm &item)
 
 
 //=========================================================================
-void CContinentParameters::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CContinentParameters::serial(NLMISC::IStream &f)
 {
 	f.serial(Name);
 	f.serial(PacsRBank);
@@ -397,7 +397,7 @@ void CContinentParameters::serial(class NLMISC::IStream &f) throw(NLMISC::EStrea
 
 //=========================================================================
 
-void CContinentParameters::CZC::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CContinentParameters::CZC::serial(NLMISC::IStream &f)
 {
 	f.serial (Name);
 	f.serial (ForceLoadDist);
@@ -456,7 +456,7 @@ void CContinentSheet::build(const NLGEORGES::UFormElm &item)
 }
 
 //=========================================================================
-void CContinentSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CContinentSheet::serial(NLMISC::IStream &f)
 {
 	f.serial(Continent);
 	f.serialCont(Villages);
@@ -475,7 +475,7 @@ void CContinentSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
 }
 
 //=========================================================================
-void CLandMark::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CLandMark::serial(NLMISC::IStream &f)
 {
 	f.serial(Pos, TitleTextID);
 }
diff --git a/code/ryzom/client/src/client_sheets/continent_sheet.h b/code/ryzom/client/src/client_sheets/continent_sheet.h
index 22a73471f..4a36b6a2d 100644
--- a/code/ryzom/client/src/client_sheets/continent_sheet.h
+++ b/code/ryzom/client/src/client_sheets/continent_sheet.h
@@ -39,7 +39,7 @@ public:
 	std::string       TitleTextID; // should be converted with CI18N to get the actual title in ucstring
 public:
 	void build(const NLGEORGES::UFormElm &item);
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 };*/
 
 // Parameters common to continent image in the client and to its sheet
@@ -141,7 +141,7 @@ public:
 		float		LoadDist;
 		float		UnloadDist;
 		bool		EnableRuins;		// Allow the display of shape of ruins (else building shape displayed through bot objects)
-		void serial (class NLMISC::IStream &f) throw (NLMISC::EStream);
+		void serial (NLMISC::IStream &f);
 
 		CZC()
 		{
@@ -186,7 +186,7 @@ public:
 
 
 	void build(const NLGEORGES::UFormElm &item);
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 private:
 
@@ -206,7 +206,7 @@ public:
 	CContinentSheet();
 	// from CEntitySheet
 	virtual void build(const NLGEORGES::UFormElm &item);
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 };
 
 #endif
diff --git a/code/ryzom/client/src/client_sheets/emot_list_sheet.cpp b/code/ryzom/client/src/client_sheets/emot_list_sheet.cpp
index 67959406c..99c12ef11 100644
--- a/code/ryzom/client/src/client_sheets/emot_list_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/emot_list_sheet.cpp
@@ -91,7 +91,7 @@ void CEmotListSheet::build(const NLGEORGES::UFormElm &item)
 // serial :
 // Serialize a CAutomatonStateSheet.
 //-----------------------------------------------
-void CEmotListSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CEmotListSheet::serial(NLMISC::IStream &f)
 {
 	uint32 size;
 	if (f.isReading ())
diff --git a/code/ryzom/client/src/client_sheets/emot_list_sheet.h b/code/ryzom/client/src/client_sheets/emot_list_sheet.h
index 176e0a3fd..adac75e9f 100644
--- a/code/ryzom/client/src/client_sheets/emot_list_sheet.h
+++ b/code/ryzom/client/src/client_sheets/emot_list_sheet.h
@@ -50,7 +50,7 @@ public:
 	virtual void build(const NLGEORGES::UFormElm &item);
 
 	/// Serialize sheet into binary data file.
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 };
 
 
diff --git a/code/ryzom/client/src/client_sheets/entity_sheet.h b/code/ryzom/client/src/client_sheets/entity_sheet.h
index 4e8a67d05..bb36fc04e 100644
--- a/code/ryzom/client/src/client_sheets/entity_sheet.h
+++ b/code/ryzom/client/src/client_sheets/entity_sheet.h
@@ -131,7 +131,7 @@ public:
 
 
 	/// Serialize character sheet into binary data file.
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) = 0;
+	virtual void serial(NLMISC::IStream &f) = 0;
 };
 
 
diff --git a/code/ryzom/client/src/client_sheets/faction_sheet.cpp b/code/ryzom/client/src/client_sheets/faction_sheet.cpp
index 56a8a135e..948c880ed 100644
--- a/code/ryzom/client/src/client_sheets/faction_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/faction_sheet.cpp
@@ -39,7 +39,7 @@ void CFactionSheet::build(const NLGEORGES::UFormElm &item)
 	GetFactionFormValue(item, Icon, "Icon");
 }
 //=======================================================================
-void CFactionSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CFactionSheet::serial(NLMISC::IStream &f)
 {
 	f.serial(Icon);
 }
diff --git a/code/ryzom/client/src/client_sheets/faction_sheet.h b/code/ryzom/client/src/client_sheets/faction_sheet.h
index 1b1a3f3e5..d51026e95 100644
--- a/code/ryzom/client/src/client_sheets/faction_sheet.h
+++ b/code/ryzom/client/src/client_sheets/faction_sheet.h
@@ -42,7 +42,7 @@ public:
 	void build(const NLGEORGES::UFormElm &item);
 
 	/// Serialize character sheet into binary data file.
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 };
 
diff --git a/code/ryzom/client/src/client_sheets/flora_sheet.cpp b/code/ryzom/client/src/client_sheets/flora_sheet.cpp
index 07ce872c8..445d0fbe8 100644
--- a/code/ryzom/client/src/client_sheets/flora_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/flora_sheet.cpp
@@ -56,7 +56,7 @@ void CFloraSheet::build(const NLGEORGES::UFormElm &item)
 }
 
 // ***************************************************************************************************
-void CFloraSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CFloraSheet::serial(NLMISC::IStream &f)
 {
 	f.serialCont(_Plants);
 	f.serial(MicroLifeThreshold);
@@ -75,7 +75,7 @@ void CPlantInfo::build(const NLGEORGES::UFormElm &item)
 }
 
 // ***************************************************************************************************
-void CPlantInfo::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPlantInfo::serial(NLMISC::IStream &f)
 {
 	f.serial(SheetName);
 	f.serial(CumulatedWeight);
diff --git a/code/ryzom/client/src/client_sheets/flora_sheet.h b/code/ryzom/client/src/client_sheets/flora_sheet.h
index 73666f559..549656742 100644
--- a/code/ryzom/client/src/client_sheets/flora_sheet.h
+++ b/code/ryzom/client/src/client_sheets/flora_sheet.h
@@ -32,7 +32,7 @@ public:
 	uint64      CumulatedWeight; // for sorting by weights
 public:
 	virtual void build(const NLGEORGES::UFormElm &item);
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 };
 inline bool operator < (const CPlantInfo &lhs, const CPlantInfo &rhs)
 {
@@ -53,7 +53,7 @@ public:
 	/// Build the sheet from an external script.
 	virtual void build(const NLGEORGES::UFormElm &item);
 	/// Serialize plant sheet into binary data file.
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 	// Get total weight of plant infos
 	uint64		 getPlantInfoTotalWeight() const { return _TotalWeight; }
 	/** Get plant info from weighted index
diff --git a/code/ryzom/client/src/client_sheets/forage_source_sheet.cpp b/code/ryzom/client/src/client_sheets/forage_source_sheet.cpp
index 344ed06b4..d8678e0d0 100644
--- a/code/ryzom/client/src/client_sheets/forage_source_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/forage_source_sheet.cpp
@@ -63,7 +63,7 @@ void CForageSourceSheet::build(const NLGEORGES::UFormElm &item)
 /*
  * Serialize character sheet into binary data file.
  */
-void CForageSourceSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CForageSourceSheet::serial(NLMISC::IStream &f)
 {
 	f.serial( FxFilename );
 	f.serial( FxSafeFilename );
diff --git a/code/ryzom/client/src/client_sheets/forage_source_sheet.h b/code/ryzom/client/src/client_sheets/forage_source_sheet.h
index af8a5594e..179c89054 100644
--- a/code/ryzom/client/src/client_sheets/forage_source_sheet.h
+++ b/code/ryzom/client/src/client_sheets/forage_source_sheet.h
@@ -40,7 +40,7 @@ public:
 	virtual void build(const NLGEORGES::UFormElm &item);
 
 	/// Serialize character sheet into binary data file.
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 
 	std::string					FxFilename;
 	std::string					FxSafeFilename;
diff --git a/code/ryzom/client/src/client_sheets/fx_sheet.cpp b/code/ryzom/client/src/client_sheets/fx_sheet.cpp
index f0fc4e160..d647b686f 100644
--- a/code/ryzom/client/src/client_sheets/fx_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/fx_sheet.cpp
@@ -203,7 +203,7 @@ void CFXSheet::build(const NLGEORGES::UFormElm &item)
 // serial :
 // Serialize FX sheet into binary data file.
 //-----------------------------------------------
-void CFXSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CFXSheet::serial(NLMISC::IStream &f)
 {
 	f.serialCont(TrailList);
 	f.serialCont(PSList);
diff --git a/code/ryzom/client/src/client_sheets/fx_sheet.h b/code/ryzom/client/src/client_sheets/fx_sheet.h
index a6b18496d..c230f62ee 100644
--- a/code/ryzom/client/src/client_sheets/fx_sheet.h
+++ b/code/ryzom/client/src/client_sheets/fx_sheet.h
@@ -82,7 +82,7 @@ public:
 			}
 
 			/// Serialize character sheet into binary data file.
-			virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+			virtual void serial(NLMISC::IStream &f)
 			{
 				f.serial(UserParam0);
 				f.serial(UserParam1);
@@ -108,7 +108,7 @@ public:
 		}
 
 		/// Serialize character sheet into binary data file.
-		virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+		virtual void serial(NLMISC::IStream &f)
 		{
 			f.serial(PSName);
 			f.serial(Anim);
@@ -126,7 +126,7 @@ public:
 	virtual void build(const NLGEORGES::UFormElm &item);
 
 	/// Serialize character sheet into binary data file.
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 };
 
 
diff --git a/code/ryzom/client/src/client_sheets/fx_stick_mode.cpp b/code/ryzom/client/src/client_sheets/fx_stick_mode.cpp
index fcdb9ea0e..ec56bf9d1 100644
--- a/code/ryzom/client/src/client_sheets/fx_stick_mode.cpp
+++ b/code/ryzom/client/src/client_sheets/fx_stick_mode.cpp
@@ -45,7 +45,7 @@ bool CFXStickMode::build(const NLGEORGES::UFormElm &item, const std::string &pre
 //-----------------------------------------------
 // serial
 //-----------------------------------------------
-void CFXStickMode::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CFXStickMode::serial(NLMISC::IStream &f)
 {
 	f.serialEnum(Mode);
 	NLMISC::CStringMapper::serialString(f, UserBoneName);
diff --git a/code/ryzom/client/src/client_sheets/fx_stick_mode.h b/code/ryzom/client/src/client_sheets/fx_stick_mode.h
index c0aae32e9..f37607779 100644
--- a/code/ryzom/client/src/client_sheets/fx_stick_mode.h
+++ b/code/ryzom/client/src/client_sheets/fx_stick_mode.h
@@ -65,7 +65,7 @@ public:
 	bool build(const NLGEORGES::UFormElm &item, const std::string &prefix = "");
 
 	/// Save and Load
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 };
 
 #endif
diff --git a/code/ryzom/client/src/client_sheets/ground_fx_sheet.cpp b/code/ryzom/client/src/client_sheets/ground_fx_sheet.cpp
index 02985ea79..131b26e87 100644
--- a/code/ryzom/client/src/client_sheets/ground_fx_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/ground_fx_sheet.cpp
@@ -33,7 +33,7 @@ bool CGroundFXSheet::build(const NLGEORGES::UFormElm &item)
 }
 
 // ***************************************************************************
-void CGroundFXSheet::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CGroundFXSheet::serial(NLMISC::IStream &f)
 {
 	f.serial(GroundID);
 	ClientSheetsStrings.serial(f, IdFXName);
diff --git a/code/ryzom/client/src/client_sheets/ground_fx_sheet.h b/code/ryzom/client/src/client_sheets/ground_fx_sheet.h
index 5175216e7..f55eb0a0d 100644
--- a/code/ryzom/client/src/client_sheets/ground_fx_sheet.h
+++ b/code/ryzom/client/src/client_sheets/ground_fx_sheet.h
@@ -42,7 +42,7 @@ public:
 	// build that sheet from a form
 	bool build(const NLGEORGES::UFormElm &item);
 	// serial this sheet
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 };
 
 // operator < sort ground fx by ground type
diff --git a/code/ryzom/client/src/client_sheets/id_to_string_array.cpp b/code/ryzom/client/src/client_sheets/id_to_string_array.cpp
index 447ad153c..28b3fd6f3 100644
--- a/code/ryzom/client/src/client_sheets/id_to_string_array.cpp
+++ b/code/ryzom/client/src/client_sheets/id_to_string_array.cpp
@@ -51,7 +51,7 @@ void CIDToStringArraySheet::build(const NLGEORGES::UFormElm &item)
 }
 
 // *******************************************************************************************
-void CIDToStringArraySheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CIDToStringArraySheet::serial(NLMISC::IStream &f)
 {
 	f.serialCont(Array);
 }
@@ -64,7 +64,7 @@ void CIDToString::build(const NLGEORGES::UFormElm &item)
 }
 
 // *******************************************************************************************
-void CIDToString::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CIDToString::serial(NLMISC::IStream &f)
 {
 	f.serial(ID);
 	f.serial(String);
diff --git a/code/ryzom/client/src/client_sheets/id_to_string_array.h b/code/ryzom/client/src/client_sheets/id_to_string_array.h
index 501564fef..ab0bc7f62 100644
--- a/code/ryzom/client/src/client_sheets/id_to_string_array.h
+++ b/code/ryzom/client/src/client_sheets/id_to_string_array.h
@@ -32,7 +32,7 @@ public:
 	std::string String;
 public:
 	virtual void build(const NLGEORGES::UFormElm &item);
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 };
 
 
@@ -48,7 +48,7 @@ public:
 	/// Build the entity from an external script.
 	virtual void build(const NLGEORGES::UFormElm &item);
 	/// Serialize character sheet into binary data file.
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 };
 
 
diff --git a/code/ryzom/client/src/client_sheets/item_fx_sheet.cpp b/code/ryzom/client/src/client_sheets/item_fx_sheet.cpp
index bfd671bca..84ac859e4 100644
--- a/code/ryzom/client/src/client_sheets/item_fx_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/item_fx_sheet.cpp
@@ -73,7 +73,7 @@ void CItemFXSheet::build(const NLGEORGES::UFormElm &item, const std::string &pre
 }
 
 // *******************************************************************************************
-void CItemFXSheet::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CItemFXSheet::serial(NLMISC::IStream &f)
 {
 	f.serial(TrailMinSliceTime);
 	f.serial(TrailMaxSliceTime);
@@ -119,7 +119,7 @@ void CItemFXSheet::CStaticFX::build(const NLGEORGES::UFormElm &item)
 }
 
 // *******************************************************************************************
-void CItemFXSheet::CStaticFX::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CItemFXSheet::CStaticFX::serial(NLMISC::IStream &f)
 {
 	ClientSheetsStrings.serial(f, Name);
 	ClientSheetsStrings.serial(f, Bone);
diff --git a/code/ryzom/client/src/client_sheets/item_fx_sheet.h b/code/ryzom/client/src/client_sheets/item_fx_sheet.h
index 98683a723..f19edfa3f 100644
--- a/code/ryzom/client/src/client_sheets/item_fx_sheet.h
+++ b/code/ryzom/client/src/client_sheets/item_fx_sheet.h
@@ -42,7 +42,7 @@ public:
 	CItemFXSheet();
 	// build that an external script
 	void build(const NLGEORGES::UFormElm &item, const std::string &prefix);
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 	// access to string ids values
 	const char *getTrail() const;
 	const char *getAdvantageFX() const;
@@ -64,7 +64,7 @@ private:
 		{
 		}
 		void build(const NLGEORGES::UFormElm &item);
-		void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+		void serial(NLMISC::IStream &f);
 	};
 	NLMISC::TSStringId  _Trail;			    // a trail that is displayed when the item is used to attack
 	NLMISC::TSStringId	_AdvantageFX;		// fx to played on some items when the player master it
diff --git a/code/ryzom/client/src/client_sheets/item_sheet.cpp b/code/ryzom/client/src/client_sheets/item_sheet.cpp
index 72183d9cc..91e3fcf7a 100644
--- a/code/ryzom/client/src/client_sheets/item_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/item_sheet.cpp
@@ -611,7 +611,7 @@ void CItemSheet::build(const NLGEORGES::UFormElm &item)
 // serial :
 // Serialize character sheet into binary data file.
 //-----------------------------------------------
-void CItemSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CItemSheet::serial(NLMISC::IStream &f)
 {
 	ClientSheetsStrings.serial(f, IdShape);
 	ClientSheetsStrings.serial(f, IdShapeFemale);
diff --git a/code/ryzom/client/src/client_sheets/item_sheet.h b/code/ryzom/client/src/client_sheets/item_sheet.h
index 250f8411e..c363c9756 100644
--- a/code/ryzom/client/src/client_sheets/item_sheet.h
+++ b/code/ryzom/client/src/client_sheets/item_sheet.h
@@ -401,7 +401,7 @@ public:
 	virtual void build(const NLGEORGES::UFormElm &item);
 
 	/// Serialize character sheet into binary data file.
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 
 	/// true if the item can put in the slot e
 	bool		hasSlot(SLOTTYPE::TSlotType e) const {return (SlotBF&(SINT64_CONSTANT(1)<<e))!=0;}
diff --git a/code/ryzom/client/src/client_sheets/light_cycle_sheet.cpp b/code/ryzom/client/src/client_sheets/light_cycle_sheet.cpp
index d88d032f3..cd43284dd 100644
--- a/code/ryzom/client/src/client_sheets/light_cycle_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/light_cycle_sheet.cpp
@@ -31,7 +31,7 @@ void CLightCycleSheet::build(const NLGEORGES::UFormElm &item)
 	LightCycle.build(item);
 }
 
-void CLightCycleSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CLightCycleSheet::serial(NLMISC::IStream &f)
 {
 	LightCycle.serial(f);
 }
diff --git a/code/ryzom/client/src/client_sheets/light_cycle_sheet.h b/code/ryzom/client/src/client_sheets/light_cycle_sheet.h
index c37ec03b0..90623057f 100644
--- a/code/ryzom/client/src/client_sheets/light_cycle_sheet.h
+++ b/code/ryzom/client/src/client_sheets/light_cycle_sheet.h
@@ -38,7 +38,7 @@ public:
 	CLightCycleSheet();
 	// from CEntitySheet
 	virtual void build(const NLGEORGES::UFormElm &item);
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 
 };
 
diff --git a/code/ryzom/client/src/client_sheets/mission_icon_sheet.cpp b/code/ryzom/client/src/client_sheets/mission_icon_sheet.cpp
index 0692bc05b..5021af638 100644
--- a/code/ryzom/client/src/client_sheets/mission_icon_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/mission_icon_sheet.cpp
@@ -59,7 +59,7 @@ void CMissionIconSheet::build(const NLGEORGES::UFormElm &item)
 // serial :
 // Serialize character sheet into binary data file.
 //-----------------------------------------------
-void CMissionIconSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CMissionIconSheet::serial(NLMISC::IStream &f)
 {
 	f.serial(MainIconBg);
 	f.serial(MainIconFg);
diff --git a/code/ryzom/client/src/client_sheets/mission_icon_sheet.h b/code/ryzom/client/src/client_sheets/mission_icon_sheet.h
index 13d00393e..3fd325c36 100644
--- a/code/ryzom/client/src/client_sheets/mission_icon_sheet.h
+++ b/code/ryzom/client/src/client_sheets/mission_icon_sheet.h
@@ -45,7 +45,7 @@ public:
 	virtual void build(const NLGEORGES::UFormElm &item);
 
 	/// Serialize character sheet into binary data file.
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 
 	std::string		MainIconBg;
 	std::string		MainIconFg;
diff --git a/code/ryzom/client/src/client_sheets/mission_sheet.cpp b/code/ryzom/client/src/client_sheets/mission_sheet.cpp
index 8dd784ac9..1f5ae9cc8 100644
--- a/code/ryzom/client/src/client_sheets/mission_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/mission_sheet.cpp
@@ -80,7 +80,7 @@ void CMissionSheet::build(const NLGEORGES::UFormElm &item)
 // serial :
 // Serialize character sheet into binary data file.
 //-----------------------------------------------
-void CMissionSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CMissionSheet::serial(NLMISC::IStream &f)
 {
 	// Serialize class components.
 	f.serial(Name);
diff --git a/code/ryzom/client/src/client_sheets/mission_sheet.h b/code/ryzom/client/src/client_sheets/mission_sheet.h
index e116879dc..f8f21fc75 100644
--- a/code/ryzom/client/src/client_sheets/mission_sheet.h
+++ b/code/ryzom/client/src/client_sheets/mission_sheet.h
@@ -48,7 +48,7 @@ public:
 	virtual void build(const NLGEORGES::UFormElm &item);
 
 	/// Serialize character sheet into binary data file.
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 
 	std::string Name;
 	std::string Description;
diff --git a/code/ryzom/client/src/client_sheets/outpost_building_sheet.cpp b/code/ryzom/client/src/client_sheets/outpost_building_sheet.cpp
index 667f982f4..841a57aad 100644
--- a/code/ryzom/client/src/client_sheets/outpost_building_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/outpost_building_sheet.cpp
@@ -136,7 +136,7 @@ void COutpostBuildingSheet::build(const NLGEORGES::UFormElm &root)
 }
 
 // ****************************************************************************
-void COutpostBuildingSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void COutpostBuildingSheet::serial(NLMISC::IStream &f)
 {
 	f.serialEnum(OBType);
 	f.serial(CostDapper);
diff --git a/code/ryzom/client/src/client_sheets/outpost_building_sheet.h b/code/ryzom/client/src/client_sheets/outpost_building_sheet.h
index e753f3352..da0beb8fb 100644
--- a/code/ryzom/client/src/client_sheets/outpost_building_sheet.h
+++ b/code/ryzom/client/src/client_sheets/outpost_building_sheet.h
@@ -74,7 +74,7 @@ public:
 	virtual void build(const NLGEORGES::UFormElm &item);
 
 	/// From CEntitySheet  : serialize sheet into binary data file.
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 
 	std::string getIconBack() const { return ClientSheetsStrings.get(IdIconBack); }
 	std::string getIconMain() const { return ClientSheetsStrings.get(IdIconMain); }
diff --git a/code/ryzom/client/src/client_sheets/outpost_sheet.cpp b/code/ryzom/client/src/client_sheets/outpost_sheet.cpp
index d1b6acdf7..205e2ad40 100644
--- a/code/ryzom/client/src/client_sheets/outpost_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/outpost_sheet.cpp
@@ -41,7 +41,7 @@ void COutpostSheet::build(const NLGEORGES::UFormElm &root)
 }
 
 // ****************************************************************************
-void COutpostSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void COutpostSheet::serial(NLMISC::IStream &f)
 {
 	f.serial(NbMaxSpawnedSquad);
 	f.serial(NbMaxSpawnedMercenarySquad);
diff --git a/code/ryzom/client/src/client_sheets/outpost_sheet.h b/code/ryzom/client/src/client_sheets/outpost_sheet.h
index 38f6ff76c..89d3c5959 100644
--- a/code/ryzom/client/src/client_sheets/outpost_sheet.h
+++ b/code/ryzom/client/src/client_sheets/outpost_sheet.h
@@ -36,7 +36,7 @@ public:
 	virtual void build(const NLGEORGES::UFormElm &item);
 
 	/// From CEntitySheet  : serialize sheet into binary data file.
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 };
 
 
diff --git a/code/ryzom/client/src/client_sheets/outpost_squad_sheet.cpp b/code/ryzom/client/src/client_sheets/outpost_squad_sheet.cpp
index 4f148928b..9d2b35e76 100644
--- a/code/ryzom/client/src/client_sheets/outpost_squad_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/outpost_squad_sheet.cpp
@@ -33,7 +33,7 @@ void COutpostSquadSheet::build(const NLGEORGES::UFormElm &root)
 }
 
 // ****************************************************************************
-void COutpostSquadSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void COutpostSquadSheet::serial(NLMISC::IStream &f)
 {
 	f.serial(BuyPrice);
 }
diff --git a/code/ryzom/client/src/client_sheets/outpost_squad_sheet.h b/code/ryzom/client/src/client_sheets/outpost_squad_sheet.h
index 55df2abc4..750cfd446 100644
--- a/code/ryzom/client/src/client_sheets/outpost_squad_sheet.h
+++ b/code/ryzom/client/src/client_sheets/outpost_squad_sheet.h
@@ -33,7 +33,7 @@ public:
 	virtual void build(const NLGEORGES::UFormElm &item);
 
 	/// From CEntitySheet  : serialize sheet into binary data file.
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 };
 
 
diff --git a/code/ryzom/client/src/client_sheets/pact_sheet.cpp b/code/ryzom/client/src/client_sheets/pact_sheet.cpp
index 37d64e2e9..dc639616e 100644
--- a/code/ryzom/client/src/client_sheets/pact_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/pact_sheet.cpp
@@ -87,7 +87,7 @@ void CPactSheet::build(const NLGEORGES::UFormElm &root)
 
 
 //=================================================================================
-void CPactSheet::serial(class NLMISC::IStream &f)	throw(NLMISC::EStream)
+void CPactSheet::serial(NLMISC::IStream &f)
 {
 	f.serialCont(PactLose);
 	f.serial(Icon);
diff --git a/code/ryzom/client/src/client_sheets/pact_sheet.h b/code/ryzom/client/src/client_sheets/pact_sheet.h
index daca88300..b013c1515 100644
--- a/code/ryzom/client/src/client_sheets/pact_sheet.h
+++ b/code/ryzom/client/src/client_sheets/pact_sheet.h
@@ -34,7 +34,7 @@ public:
 		float	    Duration;
 		std::string Name;
 
-		void serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+		void serial(NLMISC::IStream &f)
 		{
 			f.serial( LoseChaScore1Level);
 			f.serial( LoseChaScore2Level );
@@ -54,7 +54,7 @@ public:
 		/// Build the sheet from an external script.
 		virtual void build(const NLGEORGES::UFormElm &item);
 		/// Serialize plant sheet into binary data file.
-		virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+		virtual void serial(NLMISC::IStream &f);
 	//@}
 };
 
diff --git a/code/ryzom/client/src/client_sheets/plant_sheet.cpp b/code/ryzom/client/src/client_sheets/plant_sheet.cpp
index 5cefb3fcc..e9f75c7c4 100644
--- a/code/ryzom/client/src/client_sheets/plant_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/plant_sheet.cpp
@@ -146,7 +146,7 @@ void CSeasonFXSheet::build(const NLGEORGES::UFormElm &item, NLMISC::CSheetId par
 }
 
 //=======================================================
-void CSeasonFXSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CSeasonFXSheet::serial(NLMISC::IStream &f)
 {
 	f.serial(FXName);
 	f.serialEnum(Mode);
@@ -226,7 +226,7 @@ void CPlantSheet::build(const NLGEORGES::UFormElm &item)
 }
 
 //=======================================================
-void CPlantSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPlantSheet::serial(NLMISC::IStream &f)
 {
 	f.serial(_ShapeName, _MaxDist, _CoarseMeshDist);
 	for(uint k = 0; k < EGSPD::CSeason::Invalid; ++k)
diff --git a/code/ryzom/client/src/client_sheets/plant_sheet.h b/code/ryzom/client/src/client_sheets/plant_sheet.h
index b7ee6ab0a..88df3e969 100644
--- a/code/ryzom/client/src/client_sheets/plant_sheet.h
+++ b/code/ryzom/client/src/client_sheets/plant_sheet.h
@@ -86,7 +86,7 @@ public:
 	/// Build the sheet from an external script.
 	virtual void build(const NLGEORGES::UFormElm &item, NLMISC::CSheetId parentId, const std::string &prefix);
 	/// Serialize sheet into binary data file.
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 };
 
 /**
@@ -105,7 +105,7 @@ public:
 		/// Build the sheet from an external script.
 		virtual void build(const NLGEORGES::UFormElm &item);
 		/// Serialize plant sheet into binary data file.
-		virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+		virtual void serial(NLMISC::IStream &f);
 	//@}
 
 	// Get the shape name of this plant
diff --git a/code/ryzom/client/src/client_sheets/player_sheet.cpp b/code/ryzom/client/src/client_sheets/player_sheet.cpp
index 32d080cb3..d339f99cb 100644
--- a/code/ryzom/client/src/client_sheets/player_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/player_sheet.cpp
@@ -181,7 +181,7 @@ void CPlayerSheet::buildCharac(const NLGEORGES::UFormElm &item)
 // serial :
 // Serialize player sheet into binary data file.
 //-----------------------------------------------
-void CPlayerSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPlayerSheet::serial(NLMISC::IStream &f)
 {
 	// Serialize class components.
 	f.serial(SkelFilename);
diff --git a/code/ryzom/client/src/client_sheets/player_sheet.h b/code/ryzom/client/src/client_sheets/player_sheet.h
index 0a7922c07..f660980cc 100644
--- a/code/ryzom/client/src/client_sheets/player_sheet.h
+++ b/code/ryzom/client/src/client_sheets/player_sheet.h
@@ -66,7 +66,7 @@ public:
 		/// Build the sheet from an external script.
 		virtual void build(const std::string &key, const NLGEORGES::UFormElm &item);
 		/// Serialize
-		virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+		virtual void serial(NLMISC::IStream &f)
 		{
 			f.serial(Item, Color);
 		}
@@ -132,7 +132,7 @@ public:
 	virtual void build(const NLGEORGES::UFormElm &item);
 
 	/// Serialize character sheet into binary data file.
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 
 
 private:
diff --git a/code/ryzom/client/src/client_sheets/race_stats_sheet.cpp b/code/ryzom/client/src/client_sheets/race_stats_sheet.cpp
index 63240cd67..cad6a0c8d 100644
--- a/code/ryzom/client/src/client_sheets/race_stats_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/race_stats_sheet.cpp
@@ -130,7 +130,7 @@ void CGenderInfo::build(const NLGEORGES::UFormElm &item, const std::string &pref
 }
 
 //===============================================================
-void CGenderInfo::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CGenderInfo::serial(NLMISC::IStream &f)
 {
 	// serial used slots
 	for(uint k = 0; k < NumUsedVisualSlots; ++k)
@@ -285,7 +285,7 @@ void CRaceStatsSheet::buildGroundFXs(const NLGEORGES::UFormElm &item, const std:
 }
 
 //===============================================================
-void CRaceStatsSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CRaceStatsSheet::serial(NLMISC::IStream &f)
 {
 	for(uint k = 0; k < CHARACTERISTICS::NUM_CHARACTERISTICS; ++k)
 	{
diff --git a/code/ryzom/client/src/client_sheets/race_stats_sheet.h b/code/ryzom/client/src/client_sheets/race_stats_sheet.h
index b080478e2..5b83a40c8 100644
--- a/code/ryzom/client/src/client_sheets/race_stats_sheet.h
+++ b/code/ryzom/client/src/client_sheets/race_stats_sheet.h
@@ -70,7 +70,7 @@ struct CGenderInfo
 	/// Build
 	void build(const NLGEORGES::UFormElm &form, const std::string &prefix);
 	/// Serialize
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 	/// Get the item name for a given slot.
 	const std::string &getItemName(SLOTTYPE::EVisualSlot slot) const;
@@ -104,7 +104,7 @@ public:
 	//
 	virtual void build(const NLGEORGES::UFormElm &item);
 	/// Serialize rce_stats sheet into binary data file.
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 private:
 	void buildGroundFXs(const NLGEORGES::UFormElm &item, const std::string &name, std::vector<CGroundFXSheet> &dest);
 };
diff --git a/code/ryzom/client/src/client_sheets/sbrick_sheet.h b/code/ryzom/client/src/client_sheets/sbrick_sheet.h
index 99322542a..e44d4d5f5 100644
--- a/code/ryzom/client/src/client_sheets/sbrick_sheet.h
+++ b/code/ryzom/client/src/client_sheets/sbrick_sheet.h
@@ -76,7 +76,7 @@ public:
 			Value2=0.f;
 		}
 
-		void	serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+		void	serial(NLMISC::IStream &f)
 		{
 			f.serial(Text);
 		}
@@ -104,7 +104,7 @@ public:
 				Quantity = 0;
 			}
 
-			void serial (NLMISC::IStream &s) throw(NLMISC::EStream)
+			void serial (NLMISC::IStream &s)
 			{
 				s.serialEnum(FaberTypeFilter);
 				s.serial(Quantity);
@@ -117,7 +117,7 @@ public:
 		{
 			NLMISC::CSheetId			ItemRequired;
 			uint32						Quantity;
-			void serial (NLMISC::IStream &s) throw(NLMISC::EStream)
+			void serial (NLMISC::IStream &s)
 			{
 				s.serial(ItemRequired);
 				s.serial(Quantity);
@@ -137,7 +137,7 @@ public:
 		uint32							NbItemBuilt;
 
 
-		void serial (NLMISC::IStream &s) throw(NLMISC::EStream)
+		void serial (NLMISC::IStream &s)
 		{
 			s.serial(ItemBuilt);
 			s.serialCont(ItemPartMps);
@@ -344,7 +344,7 @@ public:
 	// Georges Std build implementation
 	virtual void build (const NLGEORGES::UFormElm &root);
 
-	virtual void serial (NLMISC::IStream &s) throw(NLMISC::EStream)
+	virtual void serial (NLMISC::IStream &s)
 	{
 		std::string sTmp;
 		s.serialCont(UsedSkills);
diff --git a/code/ryzom/client/src/client_sheets/skills_tree_sheet.h b/code/ryzom/client/src/client_sheets/skills_tree_sheet.h
index 34cb01e5a..b65115148 100644
--- a/code/ryzom/client/src/client_sheets/skills_tree_sheet.h
+++ b/code/ryzom/client/src/client_sheets/skills_tree_sheet.h
@@ -44,7 +44,7 @@ public :
 			MaxSkillValue = StageType = 0;
 		}
 
-		void serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+		void serial(NLMISC::IStream &f)
 		{
 			f.serialEnum (Skill);
 			f.serial (SkillCode);
@@ -87,7 +87,7 @@ public:
 	virtual void build(const NLGEORGES::UFormElm &item);
 
 	/// serialize
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+	virtual void serial(NLMISC::IStream &f)
 	{
 		f.serialCont( SkillsTree );
 	}
diff --git a/code/ryzom/client/src/client_sheets/sky_object_sheet.cpp b/code/ryzom/client/src/client_sheets/sky_object_sheet.cpp
index 6173feb23..33cc6ef61 100644
--- a/code/ryzom/client/src/client_sheets/sky_object_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/sky_object_sheet.cpp
@@ -33,7 +33,7 @@ void CSkyObjectSheet::CColorInfoSheet::build(const NLGEORGES::UFormElm &item, co
 }
 
 // *****************************************************************************************************
-void CSkyObjectSheet::CColorInfoSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CSkyObjectSheet::CColorInfoSheet::serial(NLMISC::IStream &f)
 {
 	f.serial(MapName);
 	f.serialEnum(Mode);
@@ -62,7 +62,7 @@ void CSkyObjectSheet::CColorGradientInfoSheet::build(const NLGEORGES::UFormElm &
 }
 
 // *****************************************************************************************************
-void CSkyObjectSheet::CColorGradientInfoSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CSkyObjectSheet::CColorGradientInfoSheet::serial(NLMISC::IStream &f)
 {
 	f.serial(TargetTextureStage);
 	f.serialCont(WeatherToGradient);
@@ -104,7 +104,7 @@ void CSkyObjectSheet::CVersionSheet::build(const NLGEORGES::UFormElm &item, cons
 }
 
 // *****************************************************************************************************
-void CSkyObjectSheet::CVersionSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CSkyObjectSheet::CVersionSheet::serial(NLMISC::IStream &f)
 {
 	f.serial(ShapeName);
 	f.serial(TransparencyPriority);
@@ -145,7 +145,7 @@ void CSkyObjectSheet::build(const NLGEORGES::UFormElm &item, const std::string &
 }
 
 // *****************************************************************************************************
-void CSkyObjectSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CSkyObjectSheet::serial(NLMISC::IStream &f)
 {
 	f.serial(Std);
 	f.serial(FallbackPass[0]);
diff --git a/code/ryzom/client/src/client_sheets/sky_object_sheet.h b/code/ryzom/client/src/client_sheets/sky_object_sheet.h
index f4ea16d2e..d6a3bff7e 100644
--- a/code/ryzom/client/src/client_sheets/sky_object_sheet.h
+++ b/code/ryzom/client/src/client_sheets/sky_object_sheet.h
@@ -50,7 +50,7 @@ public:
 		// Build from an external script
 		void build(const NLGEORGES::UFormElm &item, const std::string &prefix);
 		/// Serialize sheet into binary data file.
-		void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+		void serial(NLMISC::IStream &f);
 	};
 	////////////////////////////////////////////////////////////////////////////////
 	// tells how a color gradient is computed in the shape (-> sky dome gradient) //
@@ -71,7 +71,7 @@ public:
 		// Build from an external script
 		void build(const NLGEORGES::UFormElm &item, const std::string &prefix);
 		/// Serialize sheet into binary data file.
-		void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+		void serial(NLMISC::IStream &f);
 	};
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// A version of a sky object. If materials are too complex, a fallback version may be used instead (on gpu with 2 stages) //
@@ -105,7 +105,7 @@ public:
 		// Build from an external script
 		void build(const NLGEORGES::UFormElm &item, const std::string &prefix);
 		/// Serialize sheet into binary data file.
-		void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+		void serial(NLMISC::IStream &f);
 	};
 	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	CVersionSheet	Std;			 // standard version of the object
@@ -118,7 +118,7 @@ public:
 	// Build from an external script
 	void build(const NLGEORGES::UFormElm &item, const std::string &prefix);
 	/// Serialize sheet into binary data file.
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 };
 
 #endif
diff --git a/code/ryzom/client/src/client_sheets/sky_sheet.cpp b/code/ryzom/client/src/client_sheets/sky_sheet.cpp
index 4d3c35caf..c6a04bd68 100644
--- a/code/ryzom/client/src/client_sheets/sky_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/sky_sheet.cpp
@@ -56,7 +56,7 @@ void CSkySheet::build(const NLGEORGES::UFormElm &item, const std::string &prefix
 }
 
 // *****************************************************************************************************
-void CSkySheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CSkySheet::serial(NLMISC::IStream &f)
 {
 	f.serial(InstanceGroupName);
 	f.serial(AnimationName);
diff --git a/code/ryzom/client/src/client_sheets/sky_sheet.h b/code/ryzom/client/src/client_sheets/sky_sheet.h
index 3ec207f27..a99533580 100644
--- a/code/ryzom/client/src/client_sheets/sky_sheet.h
+++ b/code/ryzom/client/src/client_sheets/sky_sheet.h
@@ -47,7 +47,7 @@ public:
 	/// From CEntitySheet
 	virtual void build(const NLGEORGES::UFormElm &item);
 	/// From CEntitySheet  : serialize sheet into binary data file.
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 };
 
 
diff --git a/code/ryzom/client/src/client_sheets/sphrase_sheet.h b/code/ryzom/client/src/client_sheets/sphrase_sheet.h
index 25fb7fae9..c7d91dae3 100644
--- a/code/ryzom/client/src/client_sheets/sphrase_sheet.h
+++ b/code/ryzom/client/src/client_sheets/sphrase_sheet.h
@@ -56,7 +56,7 @@ public:
 
 	virtual void build (const NLGEORGES::UFormElm &root);
 
-	virtual void serial (NLMISC::IStream &s) throw(NLMISC::EStream)
+	virtual void serial (NLMISC::IStream &s)
 	{
 		s.serialCont (Bricks);
 		s.serial(Castable);
diff --git a/code/ryzom/client/src/client_sheets/success_table_sheet.h b/code/ryzom/client/src/client_sheets/success_table_sheet.h
index 657cd82ac..842d63281 100644
--- a/code/ryzom/client/src/client_sheets/success_table_sheet.h
+++ b/code/ryzom/client/src/client_sheets/success_table_sheet.h
@@ -65,7 +65,7 @@ public:
 	virtual void build(const NLGEORGES::UFormElm &root);
 
 	/// serialize
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+	virtual void serial(NLMISC::IStream &f)
 	{
 		f.serialCont(SuccessTable);
 	}
diff --git a/code/ryzom/client/src/client_sheets/text_emot_list_sheet.cpp b/code/ryzom/client/src/client_sheets/text_emot_list_sheet.cpp
index ae5389f8b..159e10687 100644
--- a/code/ryzom/client/src/client_sheets/text_emot_list_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/text_emot_list_sheet.cpp
@@ -108,7 +108,7 @@ void CTextEmotListSheet::build(const NLGEORGES::UFormElm &item)
 // serial :
 // Serialize a CAutomatonStateSheet.
 //-----------------------------------------------
-void CTextEmotListSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CTextEmotListSheet::serial(NLMISC::IStream &f)
 {
 	f.serialCont(TextEmotList);
 
diff --git a/code/ryzom/client/src/client_sheets/text_emot_list_sheet.h b/code/ryzom/client/src/client_sheets/text_emot_list_sheet.h
index 8533e14f5..7525d26c1 100644
--- a/code/ryzom/client/src/client_sheets/text_emot_list_sheet.h
+++ b/code/ryzom/client/src/client_sheets/text_emot_list_sheet.h
@@ -55,7 +55,7 @@ public:
 			UsableFromClientUI = true;
 		}
 
-		void serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+		void serial(NLMISC::IStream &f)
 		{
 			f.serial(Path);
 			f.serial(Anim);
@@ -77,7 +77,7 @@ public:
 	virtual void build(const NLGEORGES::UFormElm &item);
 
 	/// Serialize sheet into binary data file.
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 };
 
 
diff --git a/code/ryzom/client/src/client_sheets/unblock_titles_sheet.h b/code/ryzom/client/src/client_sheets/unblock_titles_sheet.h
index 48c5cc5a9..32189f019 100644
--- a/code/ryzom/client/src/client_sheets/unblock_titles_sheet.h
+++ b/code/ryzom/client/src/client_sheets/unblock_titles_sheet.h
@@ -58,7 +58,7 @@ public :
 			OrganizerRating = 0;
 		}
 
-		void serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+		void serial(NLMISC::IStream &f)
 		{
 			uint i,j;
 
@@ -188,7 +188,7 @@ public:
 	virtual void build(const NLGEORGES::UFormElm &item);
 
 	/// serialize
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+	virtual void serial(NLMISC::IStream &f)
 	{
 		f.serialCont(TitlesUnblock);
 	}
diff --git a/code/ryzom/client/src/client_sheets/village_sheet.cpp b/code/ryzom/client/src/client_sheets/village_sheet.cpp
index 6c1fd9321..d4f8c9836 100644
--- a/code/ryzom/client/src/client_sheets/village_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/village_sheet.cpp
@@ -74,7 +74,7 @@ void CVillageSheet::build(const NLGEORGES::UFormElm &item)
 	}
 }
 //=======================================================================
-void CVillageSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CVillageSheet::serial(NLMISC::IStream &f)
 {
 	f.serial(Zone);
 	f.serial(Altitude);
diff --git a/code/ryzom/client/src/client_sheets/village_sheet.h b/code/ryzom/client/src/client_sheets/village_sheet.h
index d6120b1c3..7cddc6f12 100644
--- a/code/ryzom/client/src/client_sheets/village_sheet.h
+++ b/code/ryzom/client/src/client_sheets/village_sheet.h
@@ -25,7 +25,7 @@ struct CVillageIG
 {
 	std::string IgName;
 	std::string ParentName;
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serial(IgName, ParentName);
 	}
@@ -63,7 +63,7 @@ struct CVillageSheet
 	void build(const NLGEORGES::UFormElm &item);
 
 	/// Serialize character sheet into binary data file.
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 };
 
diff --git a/code/ryzom/client/src/client_sheets/weather_function_params_sheet.cpp b/code/ryzom/client/src/client_sheets/weather_function_params_sheet.cpp
index 7f106cdb9..b2eb09026 100644
--- a/code/ryzom/client/src/client_sheets/weather_function_params_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/weather_function_params_sheet.cpp
@@ -38,7 +38,7 @@ void CWeatherFunctionParamsSheet::build(const NLGEORGES::UFormElm &item)
 }
 
 //=======================================================================
-void CWeatherFunctionParamsSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CWeatherFunctionParamsSheet::serial(NLMISC::IStream &f)
 {
 	CWeatherFunctionParamsSheetBase::serial(f);
 }
diff --git a/code/ryzom/client/src/client_sheets/weather_function_params_sheet.h b/code/ryzom/client/src/client_sheets/weather_function_params_sheet.h
index 005a92814..57193240c 100644
--- a/code/ryzom/client/src/client_sheets/weather_function_params_sheet.h
+++ b/code/ryzom/client/src/client_sheets/weather_function_params_sheet.h
@@ -31,7 +31,7 @@ public:
 	CWeatherFunctionParamsSheet();
 	// from CEntitySheet
 	virtual void build(const NLGEORGES::UFormElm &item);
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 };
 
 
diff --git a/code/ryzom/client/src/client_sheets/weather_setup_sheet.cpp b/code/ryzom/client/src/client_sheets/weather_setup_sheet.cpp
index 29c59de03..9b2241ab1 100644
--- a/code/ryzom/client/src/client_sheets/weather_setup_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/weather_setup_sheet.cpp
@@ -34,7 +34,7 @@ void CWeatherSetupSheet::build(const NLGEORGES::UFormElm &item)
 }
 
 //==================================================================================
-void CWeatherSetupSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CWeatherSetupSheet::serial(NLMISC::IStream &f)
 {
 	CWeatherSetupSheetBase::serial(f);
 }
diff --git a/code/ryzom/client/src/client_sheets/weather_setup_sheet.h b/code/ryzom/client/src/client_sheets/weather_setup_sheet.h
index 3e9021045..38ccb130e 100644
--- a/code/ryzom/client/src/client_sheets/weather_setup_sheet.h
+++ b/code/ryzom/client/src/client_sheets/weather_setup_sheet.h
@@ -39,7 +39,7 @@ public:
 	// from CEntitySheet
 	virtual void build(const NLGEORGES::UFormElm &item);
 	/// Serialize character sheet into binary data file.
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 };
 
 
diff --git a/code/ryzom/client/src/client_sheets/world_sheet.cpp b/code/ryzom/client/src/client_sheets/world_sheet.cpp
index cd5995591..1ae2f963f 100644
--- a/code/ryzom/client/src/client_sheets/world_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/world_sheet.cpp
@@ -84,7 +84,7 @@ void CWorldSheet::build(const NLGEORGES::UFormElm &item)
 }
 
 //===============================================================================
-void CWorldSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CWorldSheet::serial(NLMISC::IStream &f)
 {
 	f.serial(Name);
 	f.serialCont(ContLocs);
@@ -112,7 +112,7 @@ void SContLoc::build (const UFormElm *pItem)
 }
 
 //-----------------------------------------------
-void SContLoc::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void SContLoc::serial(NLMISC::IStream &f)
 {
 	f.serial(SelectionName);
 	f.serial(ContinentName);
@@ -156,7 +156,7 @@ void SMap::build(const NLGEORGES::UFormElm *pItem)
 }
 
 //-----------------------------------------------
-void SMap::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void SMap::serial(NLMISC::IStream &f)
 {
 	f.serial(Name);
 	f.serial(ContinentName);
@@ -176,7 +176,7 @@ void SMap::SChild::build(const NLGEORGES::UFormElm *pItem)
 }
 
 //-----------------------------------------------
-void SMap::SChild::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void SMap::SChild::serial(NLMISC::IStream &f)
 {
 	f.serial(Name);
 	f.serial(ZoneName);
diff --git a/code/ryzom/client/src/client_sheets/world_sheet.h b/code/ryzom/client/src/client_sheets/world_sheet.h
index 1507db6c9..8e1bd7804 100644
--- a/code/ryzom/client/src/client_sheets/world_sheet.h
+++ b/code/ryzom/client/src/client_sheets/world_sheet.h
@@ -32,7 +32,7 @@ struct SContLoc
 
 	SContLoc ();
 	void build (const NLGEORGES::UFormElm *pItem);
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 };
 
 // Hierarchical map node
@@ -48,13 +48,13 @@ struct SMap
 		std::string ZoneName;	// Click Zone to be found in the region_*.primitive
 		// -----------------------
 		void build (const NLGEORGES::UFormElm *pItem);
-		void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+		void serial(NLMISC::IStream &f);
 	};
 	std::vector<SChild>	Children;
 	// ---------------------------------------------------------------------------------
 	SMap();
 	void build (const NLGEORGES::UFormElm *pItem);
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 };
 
 /** Class that manage .world sheets
@@ -74,7 +74,7 @@ public:
 	CWorldSheet();
 	// from CEntitySheet;
 	virtual void build(const NLGEORGES::UFormElm &item);
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 };
 
 #endif
diff --git a/code/ryzom/client/src/continent.h b/code/ryzom/client/src/continent.h
index 838054481..7e0d599b4 100644
--- a/code/ryzom/client/src/continent.h
+++ b/code/ryzom/client/src/continent.h
@@ -126,7 +126,7 @@ public:
 	/// Get user landmark color
 	NLMISC::CRGBA	getColor () const;
 
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serial(Pos, Title, Type);
 	}
diff --git a/code/ryzom/client/src/continent_manager_build.h b/code/ryzom/client/src/continent_manager_build.h
index 0f320588a..52719f9ad 100644
--- a/code/ryzom/client/src/continent_manager_build.h
+++ b/code/ryzom/client/src/continent_manager_build.h
@@ -52,7 +52,7 @@ public:
 		Pos.y = 0.0f;
 	}
 
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serialVersion(1);
 		f.serialEnum(Type);
diff --git a/code/ryzom/client/src/entities.cpp b/code/ryzom/client/src/entities.cpp
index b46d7ce29..7d16e51dc 100644
--- a/code/ryzom/client/src/entities.cpp
+++ b/code/ryzom/client/src/entities.cpp
@@ -800,7 +800,8 @@ bool CEntityManager::setupInstance(uint32 idx, const vector<string> &keys, const
 		if (param == "transparency")
 		{
 			uint t;
-			if( fromString( values[i], t ) ) {
+			if (fromString(values[i], t))
+			{
 				t = max(0, min((int)t, 255));
 				makeInstanceTransparent(instance, t, t == 255);
 			}
@@ -864,9 +865,12 @@ bool CEntityManager::setupInstance(uint32 idx, const vector<string> &keys, const
 			float v;
 			CVector pos = getInstancePos(idx);
 			
-			if( getRelativeFloatFromString( values[i], v ) ) {
+			if (getRelativeFloatFromString(values[i], v))
+			{
 				updateVector(param, pos, v, true);
-			} else {
+			}
+			else
+			{
 				updateVector(param, pos, v, false);
 			}
 			setInstancePos(idx, pos);
@@ -877,9 +881,12 @@ bool CEntityManager::setupInstance(uint32 idx, const vector<string> &keys, const
 			float v;
 			CVector rot = getInstanceRot(idx);
 			
-			if( getRelativeFloatFromString( values[i], v ) ) {
+			if (getRelativeFloatFromString(values[i], v))
+			{
 				updateVector(param, rot, v, true);
-			} else {
+			}
+			else
+			{
 				updateVector(param, rot, v, false);
 			}
 			setInstanceRot(idx, rot);
@@ -889,9 +896,12 @@ bool CEntityManager::setupInstance(uint32 idx, const vector<string> &keys, const
 			float v;
 			CVector scale = instance.getScale();
 			
-			if( getRelativeFloatFromString( values[i], v ) ) {
+			if (getRelativeFloatFromString(values[i], v))
+			{
 				updateVector(param, scale, v, true);
-			} else {
+			}
+			else
+			{
 				updateVector(param, scale, v, false);
 			}
 			instance.setScale(scale);
@@ -909,9 +919,12 @@ bool CEntityManager::setupInstance(uint32 idx, const vector<string> &keys, const
 			
 			CVector size = CVector(width, depth, height);
 			float v;
-			if( getRelativeFloatFromString( values[i], v ) ) {
+			if (getRelativeFloatFromString(values[i], v))
+			{
 				updateVector(param, size, v, true);
-			} else {
+			}
+			else
+			{
 				updateVector(param, size, v, false);
 			}
 			primitive->setSize(size.x, size.y);
@@ -922,9 +935,12 @@ bool CEntityManager::setupInstance(uint32 idx, const vector<string> &keys, const
 			CVector pos = instance.getPos();
 			float v;
 			
-			if( getRelativeFloatFromString( values[i], v ) ) {
+			if (getRelativeFloatFromString(values[i], v))
+			{
 				updateVector(param, _ShapeInstances[idx].PrimRelativePos, v, false);
-			} else {
+			}
+			else
+			{
 				if (param == "col pos x")
 					_ShapeInstances[idx].PrimRelativePos.x = v - pos.x;
 				if (param == "col pos y")
@@ -1023,7 +1039,8 @@ CShapeInstanceReference CEntityManager::getShapeInstanceUnderPos(float x, float
 			// if intersect the bbox
 			NLMISC::CAABBox bbox;
 			//= _ShapeInstances[i].SelectionBox;
-			if(!_ShapeInstances[i].Instance.empty()) {
+			if(!_ShapeInstances[i].Instance.empty())
+			{
 				_ShapeInstances[i].Instance.getShapeAABBox(bbox);
 				CVector bbox_min;
 				CVector bbox_max;
@@ -2148,7 +2165,7 @@ void CEntityManager::writeEntities()
 // serial
 // Serialize entities.
 //-----------------------------------------------
-void CEntityManager::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CEntityManager::serial(NLMISC::IStream &f)
 {
 	// Get nb max entities possible.
 	f.serial(_NbMaxEntity);
diff --git a/code/ryzom/client/src/entities.h b/code/ryzom/client/src/entities.h
index 014020d6b..fb8504fc1 100644
--- a/code/ryzom/client/src/entities.h
+++ b/code/ryzom/client/src/entities.h
@@ -369,7 +369,7 @@ public:
 	sint64 getLogStageChangeStartLocalTime() const;
 
 	/// Serialize entities.
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 
 	// remove all attached fx of all entities (so that they can be reloaded)
 	virtual void removeAllAttachedFX();
diff --git a/code/ryzom/client/src/entity_animation_manager.cpp b/code/ryzom/client/src/entity_animation_manager.cpp
index 98a56cc3c..02ed9969b 100644
--- a/code/ryzom/client/src/entity_animation_manager.cpp
+++ b/code/ryzom/client/src/entity_animation_manager.cpp
@@ -493,7 +493,7 @@ NL3D::UPlayList *CEntityAnimationManager::createPlayList() const
 // serial :
 // Serialize a CEntityAnimationManager.
 //-----------------------------------------------
-void CEntityAnimationManager::serial(class NLMISC::IStream &/* f */) throw(NLMISC::EStream)
+void CEntityAnimationManager::serial(NLMISC::IStream &/* f */)
 {
 }// serial //
 
diff --git a/code/ryzom/client/src/entity_animation_manager.h b/code/ryzom/client/src/entity_animation_manager.h
index 31c914cfe..369be3332 100644
--- a/code/ryzom/client/src/entity_animation_manager.h
+++ b/code/ryzom/client/src/entity_animation_manager.h
@@ -320,7 +320,7 @@ public :
 
 
 	/// Serialize a CEntityAnimationManager.
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 	/** Count the number of emot
 	 * \return uint : the number of emot already known.
diff --git a/code/ryzom/client/src/entity_cl.cpp b/code/ryzom/client/src/entity_cl.cpp
index f09dba9f3..98d4c619c 100644
--- a/code/ryzom/client/src/entity_cl.cpp
+++ b/code/ryzom/client/src/entity_cl.cpp
@@ -2176,7 +2176,7 @@ void CEntityCL::displayDebugPropertyStages(float /* x */, float &y, float /* lin
 // serial :
 // Serialize entity.
 //-----------------------------------------------
-void CEntityCL::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CEntityCL::serial(NLMISC::IStream &f)
 {
 	readWrite(f);
 	if(f.isReading())
@@ -2187,7 +2187,7 @@ void CEntityCL::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
 // readWrite :
 // Read/Write Variables from/to the stream.
 //-----------------------------------------------
-void CEntityCL::readWrite(class NLMISC::IStream &f) throw(NLMISC::EStream)	// virtual
+void CEntityCL::readWrite(NLMISC::IStream &f)	// virtual
 {
 	f.serialVersion(4);
 
diff --git a/code/ryzom/client/src/entity_cl.h b/code/ryzom/client/src/entity_cl.h
index 176a44a8a..7238e9434 100644
--- a/code/ryzom/client/src/entity_cl.h
+++ b/code/ryzom/client/src/entity_cl.h
@@ -651,7 +651,7 @@ public:
 
 
 	/// Serialize entity.
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 	// return vector of ground fxs sorted by ground type, or NULL is ground fxs are not supported for the entity
 	virtual const std::vector<CGroundFXSheet> *getGroundFX() const { return NULL; }
@@ -1210,7 +1210,7 @@ public:
 	//@}
 
 	// Read/Write Variables from/to the stream.
-	virtual void readWrite(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void readWrite(NLMISC::IStream &f);
 	// To call after a read from a stream to re-initialize the entity.
 	virtual void load();
 
diff --git a/code/ryzom/client/src/far_tp.cpp b/code/ryzom/client/src/far_tp.cpp
index bafb62103..577477ea2 100644
--- a/code/ryzom/client/src/far_tp.cpp
+++ b/code/ryzom/client/src/far_tp.cpp
@@ -45,6 +45,12 @@
 #include "login_progress_post_thread.h"
 #include "interface_v3/action_handler_base.h"
 #include "item_group_manager.h"
+
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
+
 using namespace NLMISC;
 using namespace NLNET;
 using namespace NL3D;
diff --git a/code/ryzom/client/src/ig_callback.cpp b/code/ryzom/client/src/ig_callback.cpp
index 49b790d77..bf7b41625 100644
--- a/code/ryzom/client/src/ig_callback.cpp
+++ b/code/ryzom/client/src/ig_callback.cpp
@@ -45,6 +45,9 @@
 #include "client_sheets/plant_sheet.h"
 #include <memory>
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 #define RZ_PRIM_ZEXT_BLOCK_AVOIDANCE	2.0f
 
diff --git a/code/ryzom/client/src/init.cpp b/code/ryzom/client/src/init.cpp
index 244ef3384..6fc794d52 100644
--- a/code/ryzom/client/src/init.cpp
+++ b/code/ryzom/client/src/init.cpp
@@ -114,6 +114,10 @@ extern HWND SlashScreen;
 
 #include <new>
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 ///////////
 // USING //
 ///////////
diff --git a/code/ryzom/client/src/interface_v3/action_phrase_faber.cpp b/code/ryzom/client/src/interface_v3/action_phrase_faber.cpp
index d872f4553..11f0b1b88 100644
--- a/code/ryzom/client/src/interface_v3/action_phrase_faber.cpp
+++ b/code/ryzom/client/src/interface_v3/action_phrase_faber.cpp
@@ -35,6 +35,10 @@
 #include "skill_manager.h"
 #include "game_share/bot_chat_types.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 
diff --git a/code/ryzom/client/src/interface_v3/chat_window.cpp b/code/ryzom/client/src/interface_v3/chat_window.cpp
index 90b3d06a7..1ac457240 100644
--- a/code/ryzom/client/src/interface_v3/chat_window.cpp
+++ b/code/ryzom/client/src/interface_v3/chat_window.cpp
@@ -896,11 +896,8 @@ bool CChatGroupWindow::removeFreeTeller(const std::string &containerID)
 	if (i == _FreeTellers.size())
 		return false;
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
-	// Create the free teller in all the desktops images
-	for (uint m = 0; m < MAX_NUM_MODES; ++m)
-	{
-		pIM->removeGroupContainerImage(_FreeTellers[i]->getId(), m);
-	}
+	pIM->removeGroupContainerImageFromDesktops(_FreeTellers[i]->getId());
+
 	CInterfaceGroup *pRoot = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId("ui:interface"));
 	CWidgetManager::getInstance()->unMakeWindow(_FreeTellers[i]);
 	pRoot->delGroup (_FreeTellers[i]);
diff --git a/code/ryzom/client/src/interface_v3/filtered_chat_summary.cpp b/code/ryzom/client/src/interface_v3/filtered_chat_summary.cpp
index d4a00e8e4..826644f4e 100644
--- a/code/ryzom/client/src/interface_v3/filtered_chat_summary.cpp
+++ b/code/ryzom/client/src/interface_v3/filtered_chat_summary.cpp
@@ -20,7 +20,7 @@
 #include "filtered_chat_summary.h"
 
 //===================================================================================
-void CFilteredChatSummary::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CFilteredChatSummary::serial(NLMISC::IStream &f)
 {
 	sint ver= f.serialVersion(2);
 	f.serialCheck(NELID("USHC"));
@@ -39,7 +39,7 @@ void CFilteredChatSummary::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
 }
 
 //===================================================================================
-void CFilteredDynChatSummary::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CFilteredDynChatSummary::serial(NLMISC::IStream &f)
 {
 	sint ver = f.serialVersion(0);
 	f.serialCheck(NELID("USHC"));
diff --git a/code/ryzom/client/src/interface_v3/filtered_chat_summary.h b/code/ryzom/client/src/interface_v3/filtered_chat_summary.h
index e4b357262..348522d99 100644
--- a/code/ryzom/client/src/interface_v3/filtered_chat_summary.h
+++ b/code/ryzom/client/src/interface_v3/filtered_chat_summary.h
@@ -36,7 +36,7 @@ public:
 	// output
 	CChatGroup::TGroupType Target;
 public:
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 };
 
 // class for serialisation of user dyn chat (filtered chat) info
@@ -48,7 +48,7 @@ public:
 	// output
 	CChatGroup::TGroupType Target;
 public:
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 };
 
 
diff --git a/code/ryzom/client/src/interface_v3/group_map.cpp b/code/ryzom/client/src/interface_v3/group_map.cpp
index e38bb3d62..929e35f71 100644
--- a/code/ryzom/client/src/interface_v3/group_map.cpp
+++ b/code/ryzom/client/src/interface_v3/group_map.cpp
@@ -61,6 +61,10 @@
 
 #include <list>
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 extern CContinentManager ContinentMngr;
 extern NL3D::UDriver *Driver;
 extern NL3D::UScene *Scene;
diff --git a/code/ryzom/client/src/interface_v3/interface_manager.cpp b/code/ryzom/client/src/interface_v3/interface_manager.cpp
index 483978d90..9e181037c 100644
--- a/code/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/code/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -501,6 +501,7 @@ CInterfaceManager::CInterfaceManager()
 	CViewRenderer::getInstance()->init();
 
 	_CurrentMode = 0;
+	_Modes.resize(MAX_NUM_MODES);
 
 	setInGame( false );
 
@@ -1697,6 +1698,11 @@ bool CInterfaceManager::loadConfig (const string &filename)
 		f.serialCheck(NELID("GFCI"));
 		f.serial(nNbMode);
 		f.serial(_CurrentMode);
+		if (_CurrentMode > nNbMode)
+		{
+			_CurrentMode = 0;
+		}
+
 		if(ver>=10)
 		{
 			f.serial(_LastInGameScreenW);
@@ -1704,10 +1710,16 @@ bool CInterfaceManager::loadConfig (const string &filename)
 			lastInGameScreenResLoaded= true;
 		}
 
+		// Initialize at least number of modes that are saved in stream
+		_Modes.resize(std::max((uint32)MAX_NUM_MODES, nNbMode));
+		for (uint32 i = 0; i < _Modes.size(); ++i)
+		{
+			NLMISC::contReset(_Modes[i]);
+		}
+
 		// Load All Window configuration of all Modes
 		for (uint32 i = 0; i < nNbMode; ++i)
 		{
-			NLMISC::contReset(_Modes[i]);
 			// must create a tmp mem stream because desktop image expect its datas to occupy the whole stream
 			// This is because of old system that manipulated desktop image direclty as a mem stream
 			CMemStream ms;
@@ -1887,7 +1899,7 @@ bool CInterfaceManager::saveConfig (const string &filename)
 
 
 	// cleanup all desktops
-	for(uint k = 0; k < MAX_NUM_MODES; ++k)
+	for(uint k = 0; k < _Modes.size(); ++k)
 	{
 		quitVisitor.Desktop = k;
 		setMode(k);
@@ -1916,7 +1928,7 @@ bool CInterfaceManager::saveConfig (const string &filename)
 
 	uint32 i;
 
-	i = MAX_NUM_MODES;
+	i = _Modes.size();
 	try
 	{
 		f.serialVersion(ICFG_STREAM_VERSION);
@@ -1938,7 +1950,7 @@ bool CInterfaceManager::saveConfig (const string &filename)
 		f.serial(_LastInGameScreenH);
 
 		// Save All Window configuration of all Modes
-		for (i = 0; i < MAX_NUM_MODES; ++i)
+		for (i = 0; i < _Modes.size(); ++i)
 		{
 			// must create a tmp mem stream because desktop image expect its datas to occupy the whole stream
 			// This is because of old system that manipulated desktop image direclty as a mem stream
@@ -2062,7 +2074,7 @@ bool CInterfaceManager::handleEvent (const NLGUI::CEventDescriptor& event)
 void CInterfaceManager::updateDesktops( uint32 newScreenW, uint32 newScreenH )
 {
 	// *** Do it for All Backuped Desktops
-	for(uint md=0;md<MAX_NUM_MODES;md++)
+	for(uint md=0; md<_Modes.size(); md++)
 	{
 		CInterfaceConfig::CDesktopImage		&mode= _Modes[md];
 		// For all containers of this mode
@@ -2410,7 +2422,7 @@ void	CInterfaceManager::launchContextMenuInGame (const std::string &nameOfCM)
 // ***************************************************************************
 void CInterfaceManager::updateGroupContainerImage(CGroupContainer &gc, uint8 mode)
 {
-	if (mode >= MAX_NUM_MODES)
+	if (mode >= _Modes.size())
 	{
 		nlwarning("wrong desktop");
 		return;
@@ -2421,7 +2433,7 @@ void CInterfaceManager::updateGroupContainerImage(CGroupContainer &gc, uint8 mod
 // ***************************************************************************
 void CInterfaceManager::removeGroupContainerImage(const std::string &groupName, uint8 mode)
 {
-	if (mode >= MAX_NUM_MODES)
+	if (mode >= _Modes.size())
 	{
 		nlwarning("wrong desktop");
 		return;
@@ -2430,10 +2442,19 @@ void CInterfaceManager::removeGroupContainerImage(const std::string &groupName,
 
 }
 
+// ***************************************************************************
+void CInterfaceManager::removeGroupContainerImageFromDesktops(const std::string &groupName)
+{
+	for (uint i = 0; i < _Modes.size(); i++)
+	{
+		_Modes[i].removeGroupContainerImage(groupName);
+	}
+}
+
 // ***************************************************************************
 void	CInterfaceManager::setMode(uint8 newMode)
 {
-	if (newMode >= MAX_NUM_MODES)
+	if (newMode >= _Modes.size())
 		return;
 
 	if (newMode == _CurrentMode)
@@ -2498,7 +2519,7 @@ void	CInterfaceManager::setMode(uint8 newMode)
 // ***************************************************************************
 void	CInterfaceManager::resetMode(uint8 newMode)
 {
-	if (newMode >= MAX_NUM_MODES)
+	if (newMode >= _Modes.size())
 		return;
 	NLMISC::contReset(_Modes[newMode]);
 }
diff --git a/code/ryzom/client/src/interface_v3/interface_manager.h b/code/ryzom/client/src/interface_v3/interface_manager.h
index 6025868e5..93089a826 100644
--- a/code/ryzom/client/src/interface_v3/interface_manager.h
+++ b/code/ryzom/client/src/interface_v3/interface_manager.h
@@ -316,6 +316,8 @@ public:
 	// Remove a group container from a virtual desktop image
 	// \param mode Index of the virtual desktop
 	void	removeGroupContainerImage(const std::string &groupName, uint8 mode);
+	// Remove group container from all virtual desktops
+	void	removeGroupContainerImageFromDesktops(const std::string &groupName);
 
 
 
@@ -583,7 +585,7 @@ private:
 	sint32			_LastInGameScreenW, _LastInGameScreenH; // Resolution used for last InGame interface
 
 	// Modes
-	CInterfaceConfig::CDesktopImage	_Modes[MAX_NUM_MODES];
+	std::vector<CInterfaceConfig::CDesktopImage> _Modes;
 	uint8				_CurrentMode;
 
 	// true when interface manager is running 'ingame' content
diff --git a/code/ryzom/client/src/interface_v3/inventory_manager.cpp b/code/ryzom/client/src/interface_v3/inventory_manager.cpp
index f3a6c688c..f77d6d232 100644
--- a/code/ryzom/client/src/interface_v3/inventory_manager.cpp
+++ b/code/ryzom/client/src/interface_v3/inventory_manager.cpp
@@ -51,6 +51,10 @@
 
 #include "../misc.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 
@@ -2991,6 +2995,9 @@ class CHandlerInvTempAll : public IActionHandler
 {
 	virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */)
 	{
+		if (!CTempInvManager::getInstance()->isOpened()) return;
+		if (NLGUI::CDBManager::getInstance()->getDbProp("UI:TEMP_INV:ALL_EMPTY")->getValue32() != 0) return;
+
 		CInterfaceManager *pIM = CInterfaceManager::getInstance();
 		CInventoryManager *pInv = CInventoryManager::getInstance();
 
diff --git a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp b/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
index c0a3e167d..241e8f269 100644
--- a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
+++ b/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
@@ -2024,7 +2024,7 @@ int CLuaIHMRyzom::getIslandId(CLuaState &ls)
 
 // ***************************************************************************
 //
-// addShape("shape", x, y, z, "angle", scale, collision?)
+// addShape("shape", .x, .y, .z, "angle", .scale, collision?, "context", "url", highlight?, transparency?, "texture", "skeleton")
 //
 //********
 int CLuaIHMRyzom::addShape(CLuaState &ls)
diff --git a/code/ryzom/client/src/light_cycle_manager.cpp b/code/ryzom/client/src/light_cycle_manager.cpp
index 5ef2f52fb..eeeeb66f6 100644
--- a/code/ryzom/client/src/light_cycle_manager.cpp
+++ b/code/ryzom/client/src/light_cycle_manager.cpp
@@ -346,7 +346,7 @@ void CLightCycleManager::setHour(float hour, const CWeatherManagerClient &wm, NL
 
 
 	// Set the Sun color only if not indoor
-	if (ContinentMngr.cur()->Indoor)
+	if (ContinentMngr.cur() && ContinentMngr.cur()->Indoor)
 	{
 		Scene->setSunAmbient(CRGBA(150, 150, 150, 255));
 	}
diff --git a/code/ryzom/client/src/login_patch.cpp b/code/ryzom/client/src/login_patch.cpp
index 8edbd698f..b95f8c7c4 100644
--- a/code/ryzom/client/src/login_patch.cpp
+++ b/code/ryzom/client/src/login_patch.cpp
@@ -764,7 +764,7 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool
 					{
 						// don't check result, because it's possible the olk file doesn't exist
 						CFile::deleteFile(fullDstPath + FileName);
-						
+
 						// try to move it, if fails move it later in a script
 						if (CFile::moveFile(fullDstPath + FileName, ClientPatchPath + FileName))
 							succeeded = true;
@@ -881,6 +881,10 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool
 			string err = toString("Can't open file '%s' for writing: code=%d %s (error code 29)", batchFilename.c_str(), errno, strerror(errno));
 			throw Exception (err);
 		}
+		else
+		{
+			nlinfo("Creating %s...", batchFilename.c_str());
+		}
 
 		string contentPrefix;
 
@@ -893,9 +897,9 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool
 		contentPrefix += "set STARTUPPATH=%~4\n";
 		contentPrefix += toString("set UPGRADE_FILE=%%ROOTPATH%%\\%s\n", UpgradeBatchFilename.c_str());
 		contentPrefix += "\n";
-		contentPrefix += "set LOGIN=%5\n";
-		contentPrefix += "set PASSWORD=%6\n";
-		contentPrefix += "set SHARDID=%7\n";
+		contentPrefix += "set LOGIN=%~5\n";
+		contentPrefix += "set PASSWORD=%~6\n";
+		contentPrefix += "set SHARDID=%~7\n";
 #else
 		contentPrefix += "#!/bin/sh\n";
 		contentPrefix += "export RYZOM_CLIENT=\"$1\"\n";
@@ -904,9 +908,9 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool
 		contentPrefix += "export STARTUPPATH=\"$4\"\n";
 		contentPrefix += toString("export UPGRADE_FILE=$ROOTPATH/%s\n", UpgradeBatchFilename.c_str());
 		contentPrefix += "\n";
-		contentPrefix += "LOGIN=$5\n";
-		contentPrefix += "PASSWORD=$6\n";
-		contentPrefix += "SHARDID=$7\n";
+		contentPrefix += "LOGIN=\"$5\"\n";
+		contentPrefix += "PASSWORD=\"$6\"\n";
+		contentPrefix += "SHARDID=\"$7\"\n";
 #endif
 
 		contentPrefix += "\n";
@@ -928,7 +932,7 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool
 		if (wantRyzomRestart)
 		{
 			// client shouldn't be in memory anymore else it couldn't be overwritten
-			contentSuffix += toString("start \"\" /D \"%%STARTUPPATH%%\" \"%%RYZOM_CLIENT%%\" %s %%LOGIN%% %%PASSWORD%% %%SHARDID%%\n", additionalParams.c_str());
+			contentSuffix += toString("start \"\" /D \"%%STARTUPPATH%%\" \"%%RYZOM_CLIENT%%\" %s \"%%LOGIN%%\" \"%%PASSWORD%%\" \"%%SHARDID%%\"\n", additionalParams.c_str());
 		}
 #else
 		if (wantRyzomRestart)
@@ -951,9 +955,9 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool
 			// launch new client
 #ifdef NL_OS_MAC
 			// use exec command under OS X
-			contentSuffix += toString("exec \"$RYZOM_CLIENT\" %s $LOGIN $PASSWORD $SHARDID\n", additionalParams.c_str());
+			contentSuffix += toString("exec \"$RYZOM_CLIENT\" %s \"$LOGIN\" \"$PASSWORD\" \"$SHARDID\"\n", additionalParams.c_str());
 #else
-			contentSuffix += toString("\"$RYZOM_CLIENT\" %s $LOGIN $PASSWORD $SHARDID &\n", additionalParams.c_str());
+			contentSuffix += toString("\"$RYZOM_CLIENT\" %s \"$LOGIN\" \"$PASSWORD\" \"$SHARDID\" &\n", additionalParams.c_str());
 #endif
 		}
 #endif
@@ -993,7 +997,7 @@ void CPatchManager::executeBatchFile()
 	std::string batchFilename;
 
 	std::vector<std::string> arguments;
-	
+
 	std::string startupPath = Args.getStartupPath();
 
 	// 3 first parameters are Ryzom client full path, patch directory full path and client root directory full path
@@ -1029,10 +1033,11 @@ void CPatchManager::executeBatchFile()
 	if (!LoginLogin.empty())
 	{
 		arguments.push_back(LoginLogin);
-	
+
 		if (!LoginPassword.empty())
 		{
-			arguments.push_back(LoginPassword);
+			// encode password in hexadecimal to avoid invalid characters on command-line
+			arguments.push_back("0x" + toHexa(LoginPassword));
 
 			if (!r2Mode)
 			{
diff --git a/code/ryzom/client/src/motion/user_controls.cpp b/code/ryzom/client/src/motion/user_controls.cpp
index 897cba9c1..a3a4751e7 100644
--- a/code/ryzom/client/src/motion/user_controls.cpp
+++ b/code/ryzom/client/src/motion/user_controls.cpp
@@ -37,6 +37,9 @@
 //
 #include "../r2/editor.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 ///////////
 // Using //
diff --git a/code/ryzom/client/src/movie_shooter.cpp b/code/ryzom/client/src/movie_shooter.cpp
index 0bf6015bf..1358a20c4 100644
--- a/code/ryzom/client/src/movie_shooter.cpp
+++ b/code/ryzom/client/src/movie_shooter.cpp
@@ -31,6 +31,9 @@
 #include "nel/misc/debug.h"
 #include "nel/misc/system_info.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 ///////////
 // USING //
diff --git a/code/ryzom/client/src/net_manager.cpp b/code/ryzom/client/src/net_manager.cpp
index ab5bc3044..e2fa509e2 100644
--- a/code/ryzom/client/src/net_manager.cpp
+++ b/code/ryzom/client/src/net_manager.cpp
@@ -89,6 +89,9 @@
 // Std.
 #include <vector>
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 #define OLD_STRING_SYSTEM
 #define BAR_STEP_TP 2
@@ -1404,12 +1407,19 @@ void impulseCorrectPos(NLMISC::CBitMemStream &impulse)
 
 	if(UserEntity->mode() != MBEHAV::COMBAT_FLOAT)
 	{
-		// Compute the destination.
-		CVectorD dest = CVectorD((float)x/1000.0f, (float)y/1000.0f, (float)z/1000.0f);
-		// Update the position for the vision.
-		NetMngr.setReferencePosition(dest);
-		// Change the user poisition.
-		UserEntity->correctPos(dest);
+		if (x == 0) // Get SpeedAdjustement
+		{
+			UserEntity->setSpeedServerAdjust(-0.2f);
+		}
+		else
+		{
+			// Compute the destination.
+			CVectorD dest = CVectorD((float)x/1000.0f, (float)y/1000.0f, (float)z/1000.0f);
+			// Update the position for the vision.
+			NetMngr.setReferencePosition(dest);
+			// Change the user poisition.
+			UserEntity->correctPos(dest);
+		}
 	}
 }// impulseCorrectPos //
 
diff --git a/code/ryzom/client/src/network_connection.cpp b/code/ryzom/client/src/network_connection.cpp
index 2638f4162..133f92af1 100644
--- a/code/ryzom/client/src/network_connection.cpp
+++ b/code/ryzom/client/src/network_connection.cpp
@@ -98,6 +98,11 @@ using namespace CLFECOMMON;
 #include <nel/misc/path.h>
 #include <nel/misc/time_nl.h>
 #include <nel/misc/command.h>
+
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 // Stat: array of vectors of cycles when a pos is received, indexed by TCLEntityId
 struct TRDateState
 {
@@ -215,6 +220,12 @@ NLMISC_COMMAND( displayReceiveLog, "Flush the receive log into ReceiveLog.log",
 	return true;
 }
 
+#else
+
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 #endif // MEASURE_RECEIVE_DATES
 
 extern NL3D::UDriver		*Driver;
@@ -2965,7 +2976,15 @@ void	CNetworkConnection::reinit()
 
 	// Reuse the udp socket
 	_Connection.~CUdpSimSock();
+
+#ifdef new
+#undef new
+#endif
 	new (&_Connection) CUdpSimSock();
+
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 }
 
 // sends system sync acknowledge
diff --git a/code/ryzom/client/src/pacs_client.cpp b/code/ryzom/client/src/pacs_client.cpp
index 8e622d410..c021f7c1c 100644
--- a/code/ryzom/client/src/pacs_client.cpp
+++ b/code/ryzom/client/src/pacs_client.cpp
@@ -27,6 +27,10 @@
 #include "ig_callback.h"
 #include "ig_client.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 ///////////
 // USING //
 ///////////
diff --git a/code/ryzom/client/src/player_cl.cpp b/code/ryzom/client/src/player_cl.cpp
index bfcb30f0e..e29a0a06e 100644
--- a/code/ryzom/client/src/player_cl.cpp
+++ b/code/ryzom/client/src/player_cl.cpp
@@ -1246,7 +1246,7 @@ void CPlayerCL::displayDebug(float x, float &y, float lineStep)	// virtual
 // readWrite :
 // Read/Write Variables from/to the stream.
 //---------------------------------------------------
-void CPlayerCL::readWrite(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPlayerCL::readWrite(NLMISC::IStream &f)
 {
 	CCharacterCL::readWrite(f);
 
diff --git a/code/ryzom/client/src/player_cl.h b/code/ryzom/client/src/player_cl.h
index bb432e948..292461d3b 100644
--- a/code/ryzom/client/src/player_cl.h
+++ b/code/ryzom/client/src/player_cl.h
@@ -198,7 +198,7 @@ protected:
 	virtual double getMaxSpeed() const;
 
 	// Read/Write Variables from/to the stream.
-	virtual void readWrite(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void readWrite(NLMISC::IStream &f);
 	// To call after a read from a stream to re-initialize the entity.
 	virtual void load();
 
diff --git a/code/ryzom/client/src/player_r2_cl.cpp b/code/ryzom/client/src/player_r2_cl.cpp
index d04c93012..3d0e6e4df 100644
--- a/code/ryzom/client/src/player_r2_cl.cpp
+++ b/code/ryzom/client/src/player_r2_cl.cpp
@@ -987,7 +987,7 @@ void CPlayerR2CL::displayDebug(float x, float &y, float lineStep)	// virtual
 // readWrite :
 // Read/Write Variables from/to the stream.
 //---------------------------------------------------
-void CPlayerR2CL::readWrite(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPlayerR2CL::readWrite(NLMISC::IStream &f)
 {
 	CCharacterCL::readWrite(f);
 
diff --git a/code/ryzom/client/src/player_r2_cl.h b/code/ryzom/client/src/player_r2_cl.h
index a070afef9..9e00d40d0 100644
--- a/code/ryzom/client/src/player_r2_cl.h
+++ b/code/ryzom/client/src/player_r2_cl.h
@@ -179,7 +179,7 @@ protected:
 	virtual double getMaxSpeed() const;
 
 	// Read/Write Variables from/to the stream.
-	virtual void readWrite(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void readWrite(NLMISC::IStream &f);
 	// To call after a read from a stream to re-initialize the entity.
 	virtual void load();
 
diff --git a/code/ryzom/client/src/projectile_desc.h b/code/ryzom/client/src/projectile_desc.h
index 83d0674ee..aca4805d2 100644
--- a/code/ryzom/client/src/projectile_desc.h
+++ b/code/ryzom/client/src/projectile_desc.h
@@ -39,7 +39,7 @@ public:
 	/// Build the fx from an external script.
 	void build(const NLGEORGES::UFormElm &item);
 	/// Serialize a CAnimationFXSheet.
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 	// build tracks for fxs, loading animation as necessary using the given animation set
 	void buildTrack(NL3D::UAnimationSet *as);
 };
diff --git a/code/ryzom/client/src/scalable_time.cpp b/code/ryzom/client/src/scalable_time.cpp
index dac59e198..9beb70795 100644
--- a/code/ryzom/client/src/scalable_time.cpp
+++ b/code/ryzom/client/src/scalable_time.cpp
@@ -21,6 +21,10 @@
 #include "time_client.h"
 #include "nel/misc/time_nl.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 // *************************************************************************************************
 CScalableTime::CScalableTime()
 {
diff --git a/code/ryzom/client/src/session_browser.cpp b/code/ryzom/client/src/session_browser.cpp
index 46ef37a0a..e2fa97c6d 100644
--- a/code/ryzom/client/src/session_browser.cpp
+++ b/code/ryzom/client/src/session_browser.cpp
@@ -20,6 +20,10 @@
 
 #include "game_share/r2_share_itf.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 using namespace NLNET;
diff --git a/code/ryzom/client/src/session_browser_impl.cpp b/code/ryzom/client/src/session_browser_impl.cpp
index 9e82a6d15..9762c4a90 100644
--- a/code/ryzom/client/src/session_browser_impl.cpp
+++ b/code/ryzom/client/src/session_browser_impl.cpp
@@ -34,6 +34,10 @@
 //
 #include "game_share/shard_names.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 using namespace RSMGR;
diff --git a/code/ryzom/client/src/sheet_manager.cpp b/code/ryzom/client/src/sheet_manager.cpp
index 38a185d15..1c7f1f5ca 100644
--- a/code/ryzom/client/src/sheet_manager.cpp
+++ b/code/ryzom/client/src/sheet_manager.cpp
@@ -40,6 +40,9 @@
 // Game Share
 #include "game_share/visual_slot_manager.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 ///////////
 // USING //
diff --git a/code/ryzom/client/src/sky.cpp b/code/ryzom/client/src/sky.cpp
index 9b3474ada..eb7f70d7c 100644
--- a/code/ryzom/client/src/sky.cpp
+++ b/code/ryzom/client/src/sky.cpp
@@ -19,6 +19,10 @@
 #include "sky.h"
 #include "client_sheets/sky_sheet.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace NL3D;
 using namespace NLMISC;
 
diff --git a/code/ryzom/client/src/sky_material_setup.cpp b/code/ryzom/client/src/sky_material_setup.cpp
index 8ee2d2a27..10074ba6b 100644
--- a/code/ryzom/client/src/sky_material_setup.cpp
+++ b/code/ryzom/client/src/sky_material_setup.cpp
@@ -22,6 +22,10 @@
 #include "nel/3d/u_instance_material.h"
 #include "sky_material_setup.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace NL3D;
 
 H_AUTO_DECL(RZ_SkyMaterialSetup)
diff --git a/code/ryzom/client/src/sky_object.cpp b/code/ryzom/client/src/sky_object.cpp
index ad6b7615f..94185ef93 100644
--- a/code/ryzom/client/src/sky_object.cpp
+++ b/code/ryzom/client/src/sky_object.cpp
@@ -26,6 +26,10 @@
 #include "sky_object.h"
 #include "sky.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace NLMISC;
 using namespace NL3D;
 
diff --git a/code/ryzom/client/src/sky_render.cpp b/code/ryzom/client/src/sky_render.cpp
index fc3f3b09f..e917d3680 100644
--- a/code/ryzom/client/src/sky_render.cpp
+++ b/code/ryzom/client/src/sky_render.cpp
@@ -32,6 +32,9 @@
 #include "light_cycle_manager.h"
 #include "global.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 H_AUTO_DECL(RZ_SkyRender)
 
diff --git a/code/ryzom/client/src/sound_manager.cpp b/code/ryzom/client/src/sound_manager.cpp
index 5c1f49b1c..8a91c81ff 100644
--- a/code/ryzom/client/src/sound_manager.cpp
+++ b/code/ryzom/client/src/sound_manager.cpp
@@ -53,6 +53,10 @@
 # include "view.h"
 #endif
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 extern CLightCycleManager	LightCycleManager;
 extern NL3D::UDriver		*Driver;
 extern NL3D::UCamera		MainCam;
diff --git a/code/ryzom/client/src/stage.cpp b/code/ryzom/client/src/stage.cpp
index 9211f3d6c..71e4cd51d 100644
--- a/code/ryzom/client/src/stage.cpp
+++ b/code/ryzom/client/src/stage.cpp
@@ -24,6 +24,9 @@
 #include "stage.h"
 #include "game_share/entity_types.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 ///////////
 // USING //
@@ -149,7 +152,7 @@ bool CStage::getPos(NLMISC::CVectorD &pos) const
 // serial :
 // Serialize entities.
 //-----------------------------------------------
-void CStage::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CStage::serial(NLMISC::IStream &f)
 {
 	f.serial(_Time);
 	f.serialCont(_Stage);
@@ -269,7 +272,7 @@ CStage *CStageSet::addStage(NLMISC::TGameCycle gameCycle, uint property, sint64
 // serial :
 // Serialize entities.
 //-----------------------------------------------
-void CStageSet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CStageSet::serial(NLMISC::IStream &f)
 {
 	// Serialize the map.
 	f.serialCont(_StageSet);
diff --git a/code/ryzom/client/src/stage.h b/code/ryzom/client/src/stage.h
index b86a68cf2..0695721a7 100644
--- a/code/ryzom/client/src/stage.h
+++ b/code/ryzom/client/src/stage.h
@@ -112,7 +112,7 @@ public:
 	sint32	getLCTImpact() const {return _LCTImpact;}
 
 	/// Serialize entities.
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 };
 
 /**
@@ -145,7 +145,7 @@ public:
 	CStage *addStage(NLMISC::TGameCycle gameCycle, uint property, sint64 value, NLMISC::TGameCycle predictedI);
 
 	/// Serialize entities.
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 	/// Remove Positions except for those with a mode.
 	void removePosWithNoMode();
 };
diff --git a/code/ryzom/client/src/steam_client.cpp b/code/ryzom/client/src/steam_client.cpp
index db03f9496..513a50fe3 100644
--- a/code/ryzom/client/src/steam_client.cpp
+++ b/code/ryzom/client/src/steam_client.cpp
@@ -26,6 +26,13 @@
 
 #include <steam_api.h>
 
+#include <isteamutils.h>
+
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
+
 // prototypes definitions for Steam API functions we'll call
 typedef bool			(__cdecl *SteamAPI_InitFuncPtr)();
 typedef void			(__cdecl *SteamAPI_ShutdownFuncPtr)();
@@ -234,6 +241,8 @@ public:
 		}
 
 		return authSessionTicket;
+		// convert buffer to hexadecimal string
+		return NLMISC::toHexa(_AuthSessionTicketData, _AuthSessionTicketSize);
 	}
 
 private:
diff --git a/code/ryzom/client/src/streamable_entity.cpp b/code/ryzom/client/src/streamable_entity.cpp
index f1c19efd9..1bba624dc 100644
--- a/code/ryzom/client/src/streamable_entity.cpp
+++ b/code/ryzom/client/src/streamable_entity.cpp
@@ -19,6 +19,9 @@
 #include "stdpch.h"
 #include "streamable_entity.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 H_AUTO_DECL(RZ_StreamableEntity)
 
diff --git a/code/ryzom/client/src/streamable_entity_composite.cpp b/code/ryzom/client/src/streamable_entity_composite.cpp
index ae9f1998e..01e4aff17 100644
--- a/code/ryzom/client/src/streamable_entity_composite.cpp
+++ b/code/ryzom/client/src/streamable_entity_composite.cpp
@@ -21,6 +21,10 @@
 #include "streamable_entity_composite.h"
 #include "nel/misc/progress_callback.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 H_AUTO_DECL(RZ_StremableEntityComposite)
 
 //===============================================================================
diff --git a/code/ryzom/client/src/streamable_ig.cpp b/code/ryzom/client/src/streamable_ig.cpp
index e93b62c4c..eaaea24f5 100644
--- a/code/ryzom/client/src/streamable_ig.cpp
+++ b/code/ryzom/client/src/streamable_ig.cpp
@@ -28,6 +28,10 @@
 #include "streamable_ig.h"
 #include "continent_manager.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 extern CContinentManager ContinentMngr;
 
 H_AUTO_DECL(RZ_StremableIG)
diff --git a/code/ryzom/client/src/string_manager_client.cpp b/code/ryzom/client/src/string_manager_client.cpp
index b4edce7e1..cf83a1e0a 100644
--- a/code/ryzom/client/src/string_manager_client.cpp
+++ b/code/ryzom/client/src/string_manager_client.cpp
@@ -27,6 +27,10 @@
 #include "misc.h"
 #include "entity_cl.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 
diff --git a/code/ryzom/client/src/teleport.cpp b/code/ryzom/client/src/teleport.cpp
index c85c938fa..60d96c794 100644
--- a/code/ryzom/client/src/teleport.cpp
+++ b/code/ryzom/client/src/teleport.cpp
@@ -29,6 +29,9 @@
 #include "nel/georges/u_form_elm.h"
 #include "nel/georges/u_form_loader.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 ///////////
 // USING //
diff --git a/code/ryzom/client/src/text_manager.cpp b/code/ryzom/client/src/text_manager.cpp
index 9d152dcc9..bb78bffff 100644
--- a/code/ryzom/client/src/text_manager.cpp
+++ b/code/ryzom/client/src/text_manager.cpp
@@ -25,6 +25,10 @@
 #include "text_manager.h"
 
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 ///////////
 // USING //
 ///////////
diff --git a/code/ryzom/client/src/time_client.cpp b/code/ryzom/client/src/time_client.cpp
index 495e0af66..c67f70d05 100644
--- a/code/ryzom/client/src/time_client.cpp
+++ b/code/ryzom/client/src/time_client.cpp
@@ -34,6 +34,9 @@
 #include "weather.h"
 #include "game_share/light_cycle.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 ///////////
 // USING //
diff --git a/code/ryzom/client/src/timed_fx_manager.cpp b/code/ryzom/client/src/timed_fx_manager.cpp
index d37ab782f..8741e5197 100644
--- a/code/ryzom/client/src/timed_fx_manager.cpp
+++ b/code/ryzom/client/src/timed_fx_manager.cpp
@@ -32,8 +32,8 @@
 #include "nel/misc/check_fpu.h"
 
 
-#if defined(NL_DEBUG) && defined(NL_OS_WINDOWS)
-	#include <crtdbg.h>
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
 #endif
 
 using namespace std::rel_ops;
diff --git a/code/ryzom/client/src/user_agent.cpp b/code/ryzom/client/src/user_agent.cpp
index a57135dd8..f6723a6fd 100644
--- a/code/ryzom/client/src/user_agent.cpp
+++ b/code/ryzom/client/src/user_agent.cpp
@@ -47,6 +47,10 @@
 #define RYZOM_CLIENT_ICON "khanat_client"
 #endif
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 std::string getUserAgent()
 {
 	return getUserAgentName() + "/" + getUserAgentVersion();
diff --git a/code/ryzom/client/src/user_entity.cpp b/code/ryzom/client/src/user_entity.cpp
index 98a6584e5..d0f990559 100644
--- a/code/ryzom/client/src/user_entity.cpp
+++ b/code/ryzom/client/src/user_entity.cpp
@@ -80,6 +80,10 @@
 // r2
 #include "r2/editor.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 ///////////
 // USING //
 ///////////
@@ -144,6 +148,8 @@ CUserEntity::CUserEntity()
 	_FrontVelocity		= 0.0f;
 	_LateralVelocity	= 0.0f;
 
+	_SpeedServerAdjust  = 1.0f;
+	
 	// \todo GUIGUI : do it more generic.
 	_First_Pos = false;
 
@@ -1205,7 +1211,11 @@ void CUserEntity::applyMotion(CEntityCL *target)
 			speed = CVectorD::Null;
 	}
 	else
+	{
 		speed = getVelocity()*_SpeedFactor.getValue();
+		_SpeedFactor.addFactorValue(0.005f);
+	}
+	
 	// SPEED VECTOR NULL -> NO MOVE
 	if(speed == CVectorD::Null)
 		return;
@@ -1227,6 +1237,9 @@ void CUserEntity::applyMotion(CEntityCL *target)
 	// Third Person View
 	else
 	{
+		double modif = (100.0f/(float)NetMngr.getMsPerTick());
+		clamp(modif, 0.0, 1.0);
+		speed *= modif;
 		speed += pos();
 		sint64 x = (sint64)((sint32)(speed.x * 1000.0));
 		sint64 y = (sint64)((sint32)(speed.y * 1000.0));
@@ -3479,6 +3492,7 @@ void CUserEntity::light()
 void CUserEntity::CSpeedFactor::init()
 {
 	_Value = 1.0f; // Default speed factor is 1.
+	_ServerFactor = 1.0f;
 	CInterfaceManager *IM = CInterfaceManager::getInstance ();
 	CCDBNodeLeaf *pNodeLeaf = NLGUI::CDBManager::getInstance()->getDbProp("SERVER:USER:SPEED_FACTOR", false);
 	if(pNodeLeaf)
@@ -3696,7 +3710,7 @@ bool CUserEntity::isVisible() const	// virtual
 // readWrite :
 // Read/Write Variables from/to the stream.
 //---------------------------------------------------
-void CUserEntity::readWrite(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CUserEntity::readWrite(NLMISC::IStream &f)
 {
 	CPlayerCL::readWrite(f);
 
diff --git a/code/ryzom/client/src/user_entity.h b/code/ryzom/client/src/user_entity.h
index 7e693536b..ae4730f32 100644
--- a/code/ryzom/client/src/user_entity.h
+++ b/code/ryzom/client/src/user_entity.h
@@ -297,6 +297,8 @@ public:
 	// get the velocity vector of the entity
 	NLMISC::CVector getVelocity() const;
 
+	inline void setSpeedServerAdjust(float speed) {_SpeedFactor.addFactorValue(speed);}
+
 	/// Check if the mount is able to run, and force walking mode if not
 	void checkMountAbleToRun();
 
@@ -423,6 +425,7 @@ public:
 	void tp(const NLMISC::CVectorD &dest);
 	/// Teleport the player to correct his position.
 	void correctPos(const NLMISC::CVectorD &dest);
+
 	/// Skill Up
 	void skillUp();
 	/// get the level of the player (max of all skills)
@@ -496,13 +499,23 @@ protected:
 		/// Release
 		void release();
 		/// Return the speed factor.
-		float getValue() const {return _Value;}
-		virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) {f.serial(_Value);}
+		float getValue() const 	{ return _Value * _ServerFactor; }
+		void setFactorValue(float value) {_ServerFactor = value;}
+		void addFactorValue(float value) {
+			_ServerFactor += value;
+			if (_ServerFactor > 1.0)
+				_ServerFactor = 1.0;
+			if (_ServerFactor < 0.1)
+				_ServerFactor = 0.1;
+		}
+
+		virtual void serial(NLMISC::IStream &f) {f.serial(_Value);}
 	protected:
 		/// Method called when the ping message is back.
 		virtual void update(NLMISC::ICDBNode* leaf);
 	private:
 		float _Value;
+		float _ServerFactor;
 	};
 
 	class CMountHunger
@@ -514,7 +527,7 @@ protected:
 		void release();
 		/// Return true if the mount can run. Precondition: UserEntity->isRiding().
 		bool canRun() const;
-		virtual void serial(class NLMISC::IStream &/* f */) throw(NLMISC::EStream) {}
+		virtual void serial(NLMISC::IStream &/* f */) {}
 	};
 
 	class CMountSpeeds : public NLMISC::ICDBNode::IPropertyObserver
@@ -545,6 +558,8 @@ protected:
 	/// Velocity : Front and Lateral
 	float						_FrontVelocity;
 	float						_LateralVelocity;
+	/// Speed adjustement from gpms
+	float						_SpeedServerAdjust;
 	/// Head Pitch
 	double						_HeadPitch;
 	/// Height of the eyes (camera).
@@ -671,7 +686,7 @@ protected:
 	virtual double getMaxSpeed() const;
 
 	/// Read/Write Variables from/to the stream.
-	virtual void readWrite(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void readWrite(NLMISC::IStream &f);
 	/// To call after a read from a stream to re-initialize the entity.
 	virtual void load();
 
diff --git a/code/ryzom/client/src/view.cpp b/code/ryzom/client/src/view.cpp
index 4bc52af08..8d097d142 100644
--- a/code/ryzom/client/src/view.cpp
+++ b/code/ryzom/client/src/view.cpp
@@ -37,6 +37,10 @@
 #include "motion/user_controls.h"
 
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using NL3D::UVisualCollisionManager;
 extern UVisualCollisionManager				*CollisionManager;
 
diff --git a/code/ryzom/client/src/village.cpp b/code/ryzom/client/src/village.cpp
index 5a94d93d3..41d698782 100644
--- a/code/ryzom/client/src/village.cpp
+++ b/code/ryzom/client/src/village.cpp
@@ -33,6 +33,10 @@
 #include "pacs_client.h"
 #include "client_cfg.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace NLMISC;
 using namespace std;
 
diff --git a/code/ryzom/client/src/water_env_map_rdr.cpp b/code/ryzom/client/src/water_env_map_rdr.cpp
index a5294a74d..a1d87ae23 100644
--- a/code/ryzom/client/src/water_env_map_rdr.cpp
+++ b/code/ryzom/client/src/water_env_map_rdr.cpp
@@ -27,6 +27,10 @@
 #include "nel/misc/matrix.h"
 #include "nel/misc/vectord.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace NL3D;
 using namespace NLMISC;
 
diff --git a/code/ryzom/client/src/water_map.cpp b/code/ryzom/client/src/water_map.cpp
index 76a4119f7..727b48311 100644
--- a/code/ryzom/client/src/water_map.cpp
+++ b/code/ryzom/client/src/water_map.cpp
@@ -31,6 +31,9 @@
 #include "nel/misc/path.h"
 #include "nel/misc/file.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 extern NL3D::UScene *Scene;
 extern NL3D::UDriver *Driver;
diff --git a/code/ryzom/client/src/weather.cpp b/code/ryzom/client/src/weather.cpp
index 91fad6f7c..5891ecb9f 100644
--- a/code/ryzom/client/src/weather.cpp
+++ b/code/ryzom/client/src/weather.cpp
@@ -36,6 +36,9 @@
 //
 #include "r2/editor.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 H_AUTO_DECL(RZ_Weather)
 
diff --git a/code/ryzom/client/src/weather_manager_client.cpp b/code/ryzom/client/src/weather_manager_client.cpp
index 8c0018fdf..81bf0236f 100644
--- a/code/ryzom/client/src/weather_manager_client.cpp
+++ b/code/ryzom/client/src/weather_manager_client.cpp
@@ -31,6 +31,10 @@
 #include "sound_manager.h"
 #include "client_cfg.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 H_AUTO_DECL(RZ_WeatherManagerClient)
 
 using namespace NLMISC;
diff --git a/code/ryzom/client/src/weather_setup_client.cpp b/code/ryzom/client/src/weather_setup_client.cpp
index 54df5d05f..519b29d3a 100644
--- a/code/ryzom/client/src/weather_setup_client.cpp
+++ b/code/ryzom/client/src/weather_setup_client.cpp
@@ -25,6 +25,9 @@
 
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 H_AUTO_DECL(RZ_WeatherSetupClient)
 
diff --git a/code/ryzom/client/src/world_database_manager.cpp b/code/ryzom/client/src/world_database_manager.cpp
index a735ab982..72add4415 100644
--- a/code/ryzom/client/src/world_database_manager.cpp
+++ b/code/ryzom/client/src/world_database_manager.cpp
@@ -25,6 +25,9 @@
 #include "world_database_manager.h"
 #include "continent_manager.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 /////////////
 // GLOBALS //
diff --git a/code/ryzom/client/src/zone_util.cpp b/code/ryzom/client/src/zone_util.cpp
index c5616d0e0..33b7fdf68 100644
--- a/code/ryzom/client/src/zone_util.cpp
+++ b/code/ryzom/client/src/zone_util.cpp
@@ -23,6 +23,9 @@
 
 using namespace std;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 bool getPosFromZoneName(const std::string &name,NLMISC::CVector2f &dest)
 {
diff --git a/code/ryzom/common/src/game_share/character_summary.cpp b/code/ryzom/common/src/game_share/character_summary.cpp
index 7b0a9f958..005f488dd 100644
--- a/code/ryzom/common/src/game_share/character_summary.cpp
+++ b/code/ryzom/common/src/game_share/character_summary.cpp
@@ -17,7 +17,7 @@
 #include "stdpch.h"
 #include "character_summary.h"
 
-void CCharacterSummary::serial(class NLMISC::IStream &f) throw (NLMISC::EStream)
+void CCharacterSummary::serial(NLMISC::IStream &f)
 {
 	f.serialVersion(0);
 	f.serial		(Mainland);
diff --git a/code/ryzom/common/src/game_share/character_summary.h b/code/ryzom/common/src/game_share/character_summary.h
index bc990d45d..34b0f2a86 100644
--- a/code/ryzom/common/src/game_share/character_summary.h
+++ b/code/ryzom/common/src/game_share/character_summary.h
@@ -77,7 +77,7 @@ struct CCharacterSummary
 	bool InNewbieland;
 
 	/// serialisation coming from a stream (net message)
-	void serial(class NLMISC::IStream &f) throw (NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 };
 
 #endif
diff --git a/code/ryzom/common/src/game_share/dir_light_setup.h b/code/ryzom/common/src/game_share/dir_light_setup.h
index 805c0b40a..208ab5cc0 100644
--- a/code/ryzom/common/src/game_share/dir_light_setup.h
+++ b/code/ryzom/common/src/game_share/dir_light_setup.h
@@ -54,7 +54,7 @@ struct CDirLightSetup
 	  */
 	bool build(const NLGEORGES::UFormElm &elm);
 	//
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serial(Ambiant, Diffuse, Specular, Direction);
 	}
diff --git a/code/ryzom/common/src/game_share/dms.cpp b/code/ryzom/common/src/game_share/dms.cpp
index 8f8af5b51..3619c294c 100644
--- a/code/ryzom/common/src/game_share/dms.cpp
+++ b/code/ryzom/common/src/game_share/dms.cpp
@@ -45,6 +45,9 @@
 #include "server_edition_module.h"
 #include "server_animation_module.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 using namespace R2;
 using namespace NLNET;
diff --git a/code/ryzom/common/src/game_share/dyn_chat.cpp b/code/ryzom/common/src/game_share/dyn_chat.cpp
index aae0015d7..eed4f33b0 100644
--- a/code/ryzom/common/src/game_share/dyn_chat.cpp
+++ b/code/ryzom/common/src/game_share/dyn_chat.cpp
@@ -17,6 +17,10 @@
 #include "stdpch.h"
 #include "dyn_chat.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace NLMISC;
 
 NL_INSTANCE_COUNTER_IMPL(CDynChatSession);
diff --git a/code/ryzom/common/src/game_share/entity_types.h b/code/ryzom/common/src/game_share/entity_types.h
index 189e7c803..23f4bd700 100644
--- a/code/ryzom/common/src/game_share/entity_types.h
+++ b/code/ryzom/common/src/game_share/entity_types.h
@@ -560,17 +560,6 @@ inline CLFECOMMON::TCoord getAbsoluteCoordinateFrom64( uint64 posvalue )
 }*/
 
 
-inline std::string toHexaString(const std::vector<uint8> &v)
-{
-	std::string res;
-	for (uint i = 0; i < v.size(); i++)
-	{
-		res += NLMISC::toString("%x",v[i]);
-	}
-	return res;
-}
-
-
 #endif // NL_ENTITY_TYPES_H
 
 /* End of entity_types.h */
diff --git a/code/ryzom/common/src/game_share/fame.cpp b/code/ryzom/common/src/game_share/fame.cpp
index 919ee3c93..a0e633199 100644
--- a/code/ryzom/common/src/game_share/fame.cpp
+++ b/code/ryzom/common/src/game_share/fame.cpp
@@ -24,6 +24,10 @@
 //#include "../entities_game_service/egs_variables.h"
 //#include "pvp_clan.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 using namespace STRING_MANAGER;
diff --git a/code/ryzom/common/src/game_share/far_position.h b/code/ryzom/common/src/game_share/far_position.h
index 36f46984b..f6b46fab3 100644
--- a/code/ryzom/common/src/game_share/far_position.h
+++ b/code/ryzom/common/src/game_share/far_position.h
@@ -94,7 +94,7 @@ public:
 	/**
 	 * Serial
 	 */
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serial(X);
 		f.serial(Y);
@@ -150,7 +150,7 @@ public:
 	/**
 	 * Serial
 	 */
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serial(SessionId);
 		f.serial(PosState);
diff --git a/code/ryzom/common/src/game_share/fog_map_build.cpp b/code/ryzom/common/src/game_share/fog_map_build.cpp
index 9e715e7b3..8b7c930f9 100644
--- a/code/ryzom/common/src/game_share/fog_map_build.cpp
+++ b/code/ryzom/common/src/game_share/fog_map_build.cpp
@@ -20,7 +20,7 @@
 #include "fog_map_build.h"
 
 //===================================================================
-void CFogMapBuild::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CFogMapBuild::serial(NLMISC::IStream &f)
 {
 	for(uint k = 0; k < NumMap; ++k)
 	{
diff --git a/code/ryzom/common/src/game_share/fog_map_build.h b/code/ryzom/common/src/game_share/fog_map_build.h
index 390f94737..c4585cd4e 100644
--- a/code/ryzom/common/src/game_share/fog_map_build.h
+++ b/code/ryzom/common/src/game_share/fog_map_build.h
@@ -33,7 +33,7 @@ public:
 	std::string ZoneMin;
 	std::string ZoneMax;
 public:
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 };
 
 #endif
diff --git a/code/ryzom/common/src/game_share/fog_of_war.cpp b/code/ryzom/common/src/game_share/fog_of_war.cpp
index 6bc3c93aa..435f26256 100644
--- a/code/ryzom/common/src/game_share/fog_of_war.cpp
+++ b/code/ryzom/common/src/game_share/fog_of_war.cpp
@@ -61,7 +61,7 @@ void IFogOfWar::explore(float worldPosX, float worldPosY)
 }
 
 // ****************************************************************************
-void IFogOfWar::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void IFogOfWar::serial(NLMISC::IStream &f)
 {
 	f.serialVersion(0);
 
diff --git a/code/ryzom/common/src/game_share/fog_of_war.h b/code/ryzom/common/src/game_share/fog_of_war.h
index e7ed58663..56f8677be 100644
--- a/code/ryzom/common/src/game_share/fog_of_war.h
+++ b/code/ryzom/common/src/game_share/fog_of_war.h
@@ -63,7 +63,7 @@ public:
 
 
 	// Serialize the map
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 };
 
 #endif
diff --git a/code/ryzom/common/src/game_share/generic_xml_msg_mngr.cpp b/code/ryzom/common/src/game_share/generic_xml_msg_mngr.cpp
index b3c002015..fd30af70d 100644
--- a/code/ryzom/common/src/game_share/generic_xml_msg_mngr.cpp
+++ b/code/ryzom/common/src/game_share/generic_xml_msg_mngr.cpp
@@ -22,6 +22,10 @@
 #include "nel/misc/file.h"
 #include "nel/misc/xml_auto_ptr.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 
diff --git a/code/ryzom/common/src/game_share/light_cycle.h b/code/ryzom/common/src/game_share/light_cycle.h
index d0fb108e7..c4682778f 100644
--- a/code/ryzom/common/src/game_share/light_cycle.h
+++ b/code/ryzom/common/src/game_share/light_cycle.h
@@ -41,7 +41,7 @@ struct CSeasonLightCycle
 	// build from a Georges form
 	void  build(const NLGEORGES::UFormElm &item);
 	// serial in a stream
-	void  serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+	void  serial(NLMISC::IStream &f)
 	{
 		f.serial(DayHour, DayToDuskHour, DuskToNightHour, NightHour, NightToDayHour);
 	}
@@ -64,7 +64,7 @@ struct CLightCycle
 	// Build from a sheet file
 	void  build(const char *sheetName);
 	//
-	void  serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+	void  serial(NLMISC::IStream &f)
 	{
 		f.serial(RealDayLength, NumHours, MaxNumColorSteps);
 		for(uint k = 0; k < EGSPD::CSeason::Invalid; ++k)
diff --git a/code/ryzom/common/src/game_share/mainland_summary.h b/code/ryzom/common/src/game_share/mainland_summary.h
index a6ed6a9ca..81c001caa 100644
--- a/code/ryzom/common/src/game_share/mainland_summary.h
+++ b/code/ryzom/common/src/game_share/mainland_summary.h
@@ -53,7 +53,7 @@ struct CMainlandSummary
 	bool Online;
 
 	/// serialisation coming from a stream (net message)
-	void serial(class NLMISC::IStream &f) throw (NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serial( Id );
 		f.serial( Name );
diff --git a/code/ryzom/common/src/game_share/mirror.cpp b/code/ryzom/common/src/game_share/mirror.cpp
index 0e634afaf..23e975831 100644
--- a/code/ryzom/common/src/game_share/mirror.cpp
+++ b/code/ryzom/common/src/game_share/mirror.cpp
@@ -21,6 +21,10 @@
 #include "synchronised_message.h"
 #include "tick_proxy_time_measure.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace NLMISC;
 using namespace NLNET;
 using namespace std;
diff --git a/code/ryzom/common/src/game_share/mirror_prop_value.cpp b/code/ryzom/common/src/game_share/mirror_prop_value.cpp
index 5383a2443..5bb63e2d0 100644
--- a/code/ryzom/common/src/game_share/mirror_prop_value.cpp
+++ b/code/ryzom/common/src/game_share/mirror_prop_value.cpp
@@ -19,6 +19,9 @@
 #include "stdpch.h"
 #include "mirror_prop_value.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 sint32 NbAllocdListCells = 0;
 sint32 MaxNbAllocdListCells = 0;
diff --git a/code/ryzom/common/src/game_share/mode_and_behaviour.h b/code/ryzom/common/src/game_share/mode_and_behaviour.h
index 59dc8c6e5..bace3847a 100644
--- a/code/ryzom/common/src/game_share/mode_and_behaviour.h
+++ b/code/ryzom/common/src/game_share/mode_and_behaviour.h
@@ -174,7 +174,7 @@ namespace MBEHAV
 			return modeToString( (EMode)Mode ); // TODO: param
 		}
 
-		inline void serial (NLMISC::IStream &f) throw (NLMISC::EStream)
+		inline void serial (NLMISC::IStream &f)
 		{
 			f.serial( RawModeAndParam );
 		}
@@ -522,7 +522,7 @@ namespace MBEHAV
 		inline bool operator != ( const CBehaviour& p ) const
 		{ return (Behaviour != (EBehaviour)p.Behaviour || Data != p.Data || Data2 != p.Data2 || DeltaChaScore1 != p.DeltaChaScore1); }
 
-		inline void serial (NLMISC::IStream &f) throw (NLMISC::EStream)
+		inline void serial (NLMISC::IStream &f)
 		{
 			if (f.isReading() )
 			{
diff --git a/code/ryzom/common/src/game_share/object.cpp b/code/ryzom/common/src/game_share/object.cpp
index f914085e4..326e6dd1f 100644
--- a/code/ryzom/common/src/game_share/object.cpp
+++ b/code/ryzom/common/src/game_share/object.cpp
@@ -25,6 +25,10 @@
 
 #include <zlib.h>
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace R2
 {
 
diff --git a/code/ryzom/common/src/game_share/persistent_data_tree.cpp b/code/ryzom/common/src/game_share/persistent_data_tree.cpp
index d10f01013..a8a15f06a 100644
--- a/code/ryzom/common/src/game_share/persistent_data_tree.cpp
+++ b/code/ryzom/common/src/game_share/persistent_data_tree.cpp
@@ -77,6 +77,9 @@
 #include "stdpch.h"
 #include "persistent_data_tree.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 //-----------------------------------------------------------------------------
 // Namespaces
diff --git a/code/ryzom/common/src/game_share/player_visual_properties.h b/code/ryzom/common/src/game_share/player_visual_properties.h
index 926bc15f0..a10f420a0 100644
--- a/code/ryzom/common/src/game_share/player_visual_properties.h
+++ b/code/ryzom/common/src/game_share/player_visual_properties.h
@@ -82,7 +82,7 @@ struct SPropVisualA
 
 	bool operator != ( const SPropVisualA& p ) const { return PropertyA != p.PropertyA; }
 
-	void serial (NLMISC::IStream &f) throw (NLMISC::EStream)
+	void serial (NLMISC::IStream &f)
 	{
 		f.serial( PropertyA );
 	}
@@ -132,7 +132,7 @@ struct SPropVisualB
 
 	bool operator != ( const SPropVisualB& p ) const { return PropertyB != p.PropertyB; }
 
-	void serial (NLMISC::IStream &f) throw (NLMISC::EStream)
+	void serial (NLMISC::IStream &f)
 	{
 		f.serial( PropertyB );
 	}
@@ -200,7 +200,7 @@ struct SPropVisualC
 
 	bool operator != ( const SPropVisualC& p ) const { return PropertyC != p.PropertyC; }
 
-	void serial (NLMISC::IStream &f) throw (NLMISC::EStream)
+	void serial (NLMISC::IStream &f)
 	{
 		f.serial( PropertyC );
 	}
@@ -286,7 +286,7 @@ struct SAltLookProp
 	//@}
 
 	// Serial
-	void serial (NLMISC::IStream &f) throw (NLMISC::EStream)
+	void serial (NLMISC::IStream &f)
 	{
 		f.serial( Summary );
 	}
@@ -321,7 +321,7 @@ struct SAltLookProp2
 	//@}
 
 	// Serial
-	void serial (NLMISC::IStream &f) throw (NLMISC::EStream)
+	void serial (NLMISC::IStream &f)
 	{
 		f.serial( Summary );
 	}
diff --git a/code/ryzom/common/src/game_share/properties.h b/code/ryzom/common/src/game_share/properties.h
index 02d98bbbe..f5c278662 100644
--- a/code/ryzom/common/src/game_share/properties.h
+++ b/code/ryzom/common/src/game_share/properties.h
@@ -202,7 +202,7 @@ public:
 	void setAllFlags() { _Properties.properties = 0xffff; }
 
 	/// serial
-	void serial (NLMISC::IStream &f) throw (NLMISC::EStream)
+	void serial (NLMISC::IStream &f)
 	{
 		f.serial( _Properties.properties );
 	}
diff --git a/code/ryzom/common/src/game_share/r2_types.h b/code/ryzom/common/src/game_share/r2_types.h
index c35e02b42..797629cf7 100644
--- a/code/ryzom/common/src/game_share/r2_types.h
+++ b/code/ryzom/common/src/game_share/r2_types.h
@@ -49,7 +49,7 @@ namespace R2
 
 		TR2TpInfos():UseTpMessage(false){}
 
-		void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+		void serial(NLMISC::IStream &f)
 		{
 
 			f.serial(UseTpMessage);
@@ -69,7 +69,7 @@ namespace R2
 		ucstring			Comment;
 
 		/// serial
-		void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+		void serial(NLMISC::IStream &f)
 		{
 			f.serial( SheetId );
 			f.serial( Name );
@@ -84,7 +84,7 @@ namespace R2
 		uint32				Quantity;
 
 		/// serial
-		void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+		void serial(NLMISC::IStream &f)
 		{
 			f.serial( SheetId );
 			f.serial( Quantity );
@@ -203,7 +203,7 @@ namespace R2
 		uint32 LocationId;
 
 		/// serial
-		void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+		void serial(NLMISC::IStream &f)
 		{
 			f.serial( Name );
 			f.serial( Island );
@@ -229,7 +229,7 @@ namespace R2
 		uint32 Act;
 		uint32 Id;
 
-		void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+		void serial(NLMISC::IStream &f)
 		{
 			f.serial( Name );
 			f.serial( Act);
@@ -354,7 +354,7 @@ namespace R2
 		typedef std::vector< std::pair< std::string ,std::string > >  TValueType;
 	public:
 		TScenarioHeaderSerializer(TValueType value = TValueType() ):Value(value) {}
-		void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+		void serial(NLMISC::IStream &f)
 		{
 			uint32 size = 0;
 			if (!f.isReading() )
diff --git a/code/ryzom/common/src/game_share/ring_access.cpp b/code/ryzom/common/src/game_share/ring_access.cpp
index 9e0ba8ce4..479b69291 100644
--- a/code/ryzom/common/src/game_share/ring_access.cpp
+++ b/code/ryzom/common/src/game_share/ring_access.cpp
@@ -35,6 +35,9 @@
 #include "nel/misc/xml_auto_ptr.h"
 
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 using namespace std;
 using namespace R2;
diff --git a/code/ryzom/common/src/game_share/scenario.cpp b/code/ryzom/common/src/game_share/scenario.cpp
index e2437eac2..3782c45cf 100644
--- a/code/ryzom/common/src/game_share/scenario.cpp
+++ b/code/ryzom/common/src/game_share/scenario.cpp
@@ -31,6 +31,10 @@
 #include "nel/misc/file.h"
 #include "nel/misc/algo.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 using namespace R2;
 //----------------------------------------------------------------
 namespace R2
diff --git a/code/ryzom/common/src/game_share/seeds.h b/code/ryzom/common/src/game_share/seeds.h
index fcb25aeb8..3c3a3dfcd 100644
--- a/code/ryzom/common/src/game_share/seeds.h
+++ b/code/ryzom/common/src/game_share/seeds.h
@@ -86,7 +86,7 @@ public:
 	// Optimize a quantity of money so that the number of seeds is minimum
 	void	 optimize();
 	// serial
-	void serial(NLMISC::IStream	&f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream	&f)
 	{
 		f.serial( _LS, _MS, _BS, _VBS);
 	}
diff --git a/code/ryzom/common/src/game_share/server_edition_module.cpp b/code/ryzom/common/src/game_share/server_edition_module.cpp
index b3e4c6b53..79cf9a6f2 100644
--- a/code/ryzom/common/src/game_share/server_edition_module.cpp
+++ b/code/ryzom/common/src/game_share/server_edition_module.cpp
@@ -60,6 +60,9 @@
 
 //#include "server_admin_module.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 using namespace std;
 using namespace NLMISC;
diff --git a/code/ryzom/common/src/game_share/simlag.cpp b/code/ryzom/common/src/game_share/simlag.cpp
index 0468caa2b..86f61b60b 100644
--- a/code/ryzom/common/src/game_share/simlag.cpp
+++ b/code/ryzom/common/src/game_share/simlag.cpp
@@ -22,6 +22,10 @@
 // Includes
 //
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 //
 // Using
 //
diff --git a/code/ryzom/common/src/game_share/skills_build.h b/code/ryzom/common/src/game_share/skills_build.h
index 323330e0c..76dd8b7cc 100644
--- a/code/ryzom/common/src/game_share/skills_build.h
+++ b/code/ryzom/common/src/game_share/skills_build.h
@@ -37,7 +37,7 @@ struct CSkillSummary
 	CSkillSummary(uint16 id, uint16 value) : ID(id), Value(value) {}
 	uint16 ID; /* see enum ESkills in skills.h */
 	uint16 Value;
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+	virtual void serial(NLMISC::IStream &f)
 	{
 		f.serial(ID, Value);
 	}
diff --git a/code/ryzom/common/src/game_share/stdpch.h b/code/ryzom/common/src/game_share/stdpch.h
index cdec993d9..46c71bcfe 100644
--- a/code/ryzom/common/src/game_share/stdpch.h
+++ b/code/ryzom/common/src/game_share/stdpch.h
@@ -14,7 +14,15 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "nel/misc/types_nl.h"
+#ifndef GAMESHARE_STDPCH_H
+#define GAMESHARE_STDPCH_H
+
+#if defined(_MSC_VER) && defined(_DEBUG)
+#define _CRTDBG_MAP_ALLOC
+#include <stdlib.h>
+#include <crtdbg.h>
+#define DEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
+#endif
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -38,6 +46,7 @@
 #include <memory>
 #include <functional>
 
+#include "nel/misc/types_nl.h"
 #include <nel/misc/common.h>
 #include <nel/misc/debug.h>
 
@@ -75,3 +84,5 @@
 #	include <WinSock2.h>
 #	include <Windows.h>
 #endif
+
+#endif
diff --git a/code/ryzom/common/src/game_share/time_weather_season/static_light_cycle.h b/code/ryzom/common/src/game_share/time_weather_season/static_light_cycle.h
index b7aa6edbe..21e6b2d37 100644
--- a/code/ryzom/common/src/game_share/time_weather_season/static_light_cycle.h
+++ b/code/ryzom/common/src/game_share/time_weather_season/static_light_cycle.h
@@ -41,7 +41,7 @@ public:
 		float NightToDayHour;
 
 		/// serialize
-		void serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+		void serial(NLMISC::IStream &f)
 		{
 			f.serial( DayHour );
 			f.serial( DayToDuskHour );
@@ -54,7 +54,7 @@ public:
 	std::vector< SLightCycle > LightCycles;
 
 	/// serialize
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serialCont( LightCycles );
 	}
diff --git a/code/ryzom/common/src/game_share/time_weather_season/weather_function_params_sheet_base.cpp b/code/ryzom/common/src/game_share/time_weather_season/weather_function_params_sheet_base.cpp
index f5707b148..01e4d9ba5 100644
--- a/code/ryzom/common/src/game_share/time_weather_season/weather_function_params_sheet_base.cpp
+++ b/code/ryzom/common/src/game_share/time_weather_season/weather_function_params_sheet_base.cpp
@@ -55,7 +55,7 @@ void CWeatherFunctionParamsSheetBase::build(const NLGEORGES::UFormElm &item)
 }
 
 //=======================================================================
-void CWeatherFunctionParamsSheetBase::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CWeatherFunctionParamsSheetBase::serial(NLMISC::IStream &f)
 {
 	f.serial(DayLength);
 	f.serial(CycleLength);
diff --git a/code/ryzom/common/src/game_share/time_weather_season/weather_function_params_sheet_base.h b/code/ryzom/common/src/game_share/time_weather_season/weather_function_params_sheet_base.h
index 695082eb5..34b8fae5a 100644
--- a/code/ryzom/common/src/game_share/time_weather_season/weather_function_params_sheet_base.h
+++ b/code/ryzom/common/src/game_share/time_weather_season/weather_function_params_sheet_base.h
@@ -50,7 +50,7 @@ public:
 	CWeatherFunctionParamsSheetBase();
 	//
 	void build(const NLGEORGES::UFormElm &item);
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 	//
 	void build(const std::string &sheetName);
 
diff --git a/code/ryzom/common/src/game_share/time_weather_season/weather_function_sheet.cpp b/code/ryzom/common/src/game_share/time_weather_season/weather_function_sheet.cpp
index 23f41abbb..0645b554e 100644
--- a/code/ryzom/common/src/game_share/time_weather_season/weather_function_sheet.cpp
+++ b/code/ryzom/common/src/game_share/time_weather_season/weather_function_sheet.cpp
@@ -103,7 +103,7 @@ void CWeatherFunctionSheet::build(const NLGEORGES::UFormElm &item)
 
 
 //=============================================================================
-void CWeatherFunctionSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CWeatherFunctionSheet::serial(NLMISC::IStream &f)
 {
 	f.serial(VegetableMinBendIntensity);
 	f.serial(VegetableMaxBendIntensity);
diff --git a/code/ryzom/common/src/game_share/time_weather_season/weather_function_sheet.h b/code/ryzom/common/src/game_share/time_weather_season/weather_function_sheet.h
index 0f9ead2bb..03a9f70a5 100644
--- a/code/ryzom/common/src/game_share/time_weather_season/weather_function_sheet.h
+++ b/code/ryzom/common/src/game_share/time_weather_season/weather_function_sheet.h
@@ -69,7 +69,7 @@ public:
 	CWeatherFunctionSheet();
 
 	void build(const NLGEORGES::UFormElm &item);
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 };
 
 
diff --git a/code/ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.cpp b/code/ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.cpp
index 345b0e4a2..a1a56f18e 100644
--- a/code/ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.cpp
+++ b/code/ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.cpp
@@ -108,7 +108,7 @@ void CWeatherStateSheet::build(const NLGEORGES::UFormElm &item)
 
 
 //==================================================================================
-void CWeatherStateSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CWeatherStateSheet::serial(NLMISC::IStream &f)
 {
 	f.serial(BestSetupName);
 	f.serial(FogRatio);
@@ -163,7 +163,7 @@ void CCloudStateSheet::build(const NLGEORGES::UFormElm &item)
 }
 
 //==================================================================================
-void CCloudStateSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CCloudStateSheet::serial(NLMISC::IStream &f)
 {
 	f.serial(AmbientDay);
 	f.serial(DiffuseDay);
@@ -196,7 +196,7 @@ void CWeatherSetupSheetBase::build(const NLGEORGES::UFormElm &item)
 }
 
 //==================================================================================
-void CWeatherSetupSheetBase::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CWeatherSetupSheetBase::serial(NLMISC::IStream &f)
 {
 	f.serial(WeatherState, CloudState);
 	if (f.isReading())
diff --git a/code/ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.h b/code/ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.h
index 9be26d11b..b7db00e01 100644
--- a/code/ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.h
+++ b/code/ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.h
@@ -48,7 +48,7 @@ public:
 
 		CFXInfos() { Ratio = 0.0f; }
 
-		void		serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+		void		serial(NLMISC::IStream &f)
 		{
 			f.serial(Name, Ratio);
 		}
@@ -86,7 +86,7 @@ public:
 	  */
 	void				 build(const NLGEORGES::UFormElm &item);
 	//
-	void				 serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	void				 serial(NLMISC::IStream &f);
 };
 
 // state of weather, including clouds
@@ -106,7 +106,7 @@ public:
 	// Build from a georges sheet
 	void				 build(const NLGEORGES::UFormElm &item);
 	//
-	void				serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	void				serial(NLMISC::IStream &f);
 };
 
 
@@ -127,7 +127,7 @@ public:
 	CWeatherSetupSheetBase();
 	// build from an external sheet
 	void build(const NLGEORGES::UFormElm &item);
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 
 	//
 	void readGeorges (const NLGEORGES::UForm *form, const NLMISC::CSheetId &sheetId);
diff --git a/code/ryzom/common/src/game_share/type_skill_mod.h b/code/ryzom/common/src/game_share/type_skill_mod.h
index 8a37a4763..9e856f7da 100644
--- a/code/ryzom/common/src/game_share/type_skill_mod.h
+++ b/code/ryzom/common/src/game_share/type_skill_mod.h
@@ -29,7 +29,7 @@ struct CTypeSkillMod
 	CTypeSkillMod() : Modifier(0),Type(EGSPD::CClassificationType::Unknown)
 	{}
 
-	void serial(class NLMISC::IStream &f)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serialEnum( Type );
 		f.serial( Modifier );
diff --git a/code/ryzom/common/src/game_share/visual_slot_manager.cpp b/code/ryzom/common/src/game_share/visual_slot_manager.cpp
index bc2410eea..4c4470a5b 100644
--- a/code/ryzom/common/src/game_share/visual_slot_manager.cpp
+++ b/code/ryzom/common/src/game_share/visual_slot_manager.cpp
@@ -30,6 +30,10 @@
 #include "visual_slot_manager.h"
 
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 ////////////////////
 // STATIC MEMBERS //
 ////////////////////
diff --git a/code/ryzom/common/src/game_share/visual_slot_manager.h b/code/ryzom/common/src/game_share/visual_slot_manager.h
index ee9d8371a..4fd46cd81 100644
--- a/code/ryzom/common/src/game_share/visual_slot_manager.h
+++ b/code/ryzom/common/src/game_share/visual_slot_manager.h
@@ -59,7 +59,7 @@ public:
 		NLMISC::CSheetId	SheetId;
 
 		/// Load/Save the values using the serial system
-		void serial(class NLMISC::IStream &s) throw(NLMISC::EStream)
+		void serial(NLMISC::IStream &s)
 		{
 			s.serial(Index);
 			s.serial(SheetId);
@@ -76,7 +76,7 @@ public:
 		SheetIdToIndexMapType SheetIdToIndexMap;
 
 		/// Load/Save the values using the serial system
-		void serial(class NLMISC::IStream &s) throw(NLMISC::EStream)
+		void serial(NLMISC::IStream &s)
 		{
 			s.serialCont(Element);
 		}
diff --git a/code/ryzom/server/src/CMakeLists.txt b/code/ryzom/server/src/CMakeLists.txt
index 73e0536d1..fc91decc4 100644
--- a/code/ryzom/server/src/CMakeLists.txt
+++ b/code/ryzom/server/src/CMakeLists.txt
@@ -1,8 +1,10 @@
 # Supporting modules and libraries.
 # Need servershare for build packed collision tool
 # Need aishare for build wmap tool
-ADD_SUBDIRECTORY(server_share)
-ADD_SUBDIRECTORY(ai_share)
+IF(WITH_RYZOM_TOOLS OR WITH_RYZOM_SERVER)
+  ADD_SUBDIRECTORY(server_share)
+  ADD_SUBDIRECTORY(ai_share)
+ENDIF()
 
 IF(WITH_RYZOM_SERVER)
 
diff --git a/code/ryzom/server/src/ai_data_service/ai_manager.h b/code/ryzom/server/src/ai_data_service/ai_manager.h
index 59bd507fd..339e044bc 100644
--- a/code/ryzom/server/src/ai_data_service/ai_manager.h
+++ b/code/ryzom/server/src/ai_data_service/ai_manager.h
@@ -56,7 +56,7 @@ public:
 		}
 		SMgrDfnElm(const SMgrDfnElm &other): Action(other.Action), Args(other.Args) {}
 
-		void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+		void serial(NLMISC::IStream &f)
 		{
 			//f.xmlPushBegin("CMD");
 				std::string s=getAction();
@@ -106,7 +106,7 @@ public:
 				Child(other.Child) 
 		{}
 
-		void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+		void serial(NLMISC::IStream &f)
 		{
 			f.serial(Name);
 			f.serialCont(Data);
diff --git a/code/ryzom/server/src/ai_share/ai_actions.h b/code/ryzom/server/src/ai_share/ai_actions.h
index aa245b5c1..98c387d43 100644
--- a/code/ryzom/server/src/ai_share/ai_actions.h
+++ b/code/ryzom/server/src/ai_share/ai_actions.h
@@ -105,7 +105,7 @@ public:
 			return "<Invalid Argument Type>";
 		}
 
-		void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+		void serial(NLMISC::IStream &f)
 		{
 			f.serialEnum(_type);
 			switch(_type)
diff --git a/code/ryzom/server/src/ai_share/ai_event.cpp b/code/ryzom/server/src/ai_share/ai_event.cpp
index ea1745bcd..1d509397a 100644
--- a/code/ryzom/server/src/ai_share/ai_event.cpp
+++ b/code/ryzom/server/src/ai_share/ai_event.cpp
@@ -36,7 +36,7 @@ NL_INSTANCE_COUNTER_IMPL(CAIStunEndEvent);
 //--------------------------------------------------------------
 //						CAIStunEvent::serial()  
 //--------------------------------------------------------------
-void CAIStunEvent::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CAIStunEvent::serial(NLMISC::IStream &f)
 {
 	if (f.isReading() )
 	{
@@ -81,7 +81,7 @@ void CAIStunEvent::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
 //--------------------------------------------------------------
 //						CAIAggroEvent::serial()  
 //--------------------------------------------------------------
-void CAIAggroEvent::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CAIAggroEvent::serial(NLMISC::IStream &f)
 {
 	if (f.isReading() )
 	{
@@ -133,7 +133,7 @@ void CAIAggroEvent::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
 //--------------------------------------------------------------
 //						CAIStunEndEvent::serial()  
 //--------------------------------------------------------------
-void CAIStunEndEvent::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CAIStunEndEvent::serial(NLMISC::IStream &f)
 {
 	if (f.isReading() )
 	{
@@ -179,7 +179,7 @@ void CAIStunEndEvent::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
 //--------------------------------------------------------------
 //						CAISurvivalInstinctEvent::serial()  
 //--------------------------------------------------------------
-void CAISurvivalInstinctEvent::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CAISurvivalInstinctEvent::serial(NLMISC::IStream &f)
 {
 	if (f.isReading() )
 	{
@@ -231,7 +231,7 @@ void CAISurvivalInstinctEvent::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
 //--------------------------------------------------------------
 //						CAIFearEvent::serial()  
 //--------------------------------------------------------------
-void CAIFearEvent::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CAIFearEvent::serial(NLMISC::IStream &f)
 {
 	if (f.isReading() )
 	{
@@ -278,7 +278,7 @@ void CAIFearEvent::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
 //--------------------------------------------------------------
 //						CAIFearEndEvent::serial()  
 //--------------------------------------------------------------
-void CAIFearEndEvent::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CAIFearEndEvent::serial(NLMISC::IStream &f)
 {
 	if (f.isReading() )
 	{
@@ -326,7 +326,7 @@ void CAIFearEndEvent::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
 //--------------------------------------------------------------
 //						CAIHungerEvent::serial()  
 //--------------------------------------------------------------
-void CAIHungerEvent::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CAIHungerEvent::serial(NLMISC::IStream &f)
 {
 	if (f.isReading() )
 	{
diff --git a/code/ryzom/server/src/ai_share/ai_event.h b/code/ryzom/server/src/ai_share/ai_event.h
index 55f179861..be567b8f2 100644
--- a/code/ryzom/server/src/ai_share/ai_event.h
+++ b/code/ryzom/server/src/ai_share/ai_event.h
@@ -115,7 +115,7 @@ public:
 		return _val>other._val;
 	}
 
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serial(_val);
 	}
@@ -151,7 +151,7 @@ public:
 	// serial()
 	// note serial should serialise: <Type> <uint16 sizeof(EventClass)> <event_parameters>
 	// the 'read' version of the serial should test the <sizeof> to ensure version robustness
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) = 0;
+	virtual void serial(NLMISC::IStream &f) = 0;
 };
 
 
@@ -173,7 +173,7 @@ public:
 	// serial()
 	// note serial should serialise: <Type> <uint16 sizeof(EventClass)> <event_parameters>
 	// the 'read' version of the serial should test the <sizeof> to ensure version robustness
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 
 public:
 	/// the stunned creature id
@@ -199,7 +199,7 @@ public:
 	// serial()
 	// note serial should serialise: <Type> <uint16 sizeof(EventClass)> <event_parameters>
 	// the 'read' version of the serial should test the <sizeof> to ensure version robustness
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 
 public:
 	/// the waked creature id
@@ -227,7 +227,7 @@ public:
 	// serial()
 	// note serial should serialise: <Type> <uint16 sizeof(EventClass)> <event_parameters>
 	// the 'read' version of the serial should test the <sizeof> to ensure version robustness
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 
 public:
 	/// the creature Id
@@ -259,7 +259,7 @@ public:
 	// serial()
 	// note serial should serialise: <Type> <uint16 sizeof(EventClass)> <event_parameters>
 	// the 'read' version of the serial should test the <sizeof> to ensure version robustness
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 
 public:
 	/// the affected creature id
@@ -291,7 +291,7 @@ public:
 	// serial()
 	// note serial should serialise: <Type> <uint16 sizeof(EventClass)> <event_parameters>
 	// the 'read' version of the serial should test the <sizeof> to ensure version robustness
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 
 public:
 	/// the creature id
@@ -317,7 +317,7 @@ public:
 	// serial()
 	// note serial should serialise: <Type> <uint16 sizeof(EventClass)> <event_parameters>
 	// the 'read' version of the serial should test the <sizeof> to ensure version robustness
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 
 public:
 	/// the creature id
@@ -342,7 +342,7 @@ public:
 	// serial()
 	// note serial should serialise: <Type> <uint16 sizeof(EventClass)> <event_parameters>
 	// the 'read' version of the serial should test the <sizeof> to ensure version robustness
-	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 
 public:
 	/// the affected creature id
diff --git a/code/ryzom/server/src/entities_game_service/character_structure/character_sentence.h b/code/ryzom/server/src/entities_game_service/character_structure/character_sentence.h
index 529f3acfc..cf9a9ec84 100644
--- a/code/ryzom/server/src/entities_game_service/character_structure/character_sentence.h
+++ b/code/ryzom/server/src/entities_game_service/character_structure/character_sentence.h
@@ -31,7 +31,7 @@ public:
 	std::vector<uint8>			BricksIndexInSentence;
 	
 	/// Serialisation
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serial( Name );
 		f.serialCont( BricksIds );
diff --git a/code/ryzom/server/src/entities_game_service/character_structure/pact_class.h b/code/ryzom/server/src/entities_game_service/character_structure/pact_class.h
index 5c9fe4dba..413e401d4 100644
--- a/code/ryzom/server/src/entities_game_service/character_structure/pact_class.h
+++ b/code/ryzom/server/src/entities_game_service/character_structure/pact_class.h
@@ -57,7 +57,7 @@ struct CPact
 
 	DECLARE_PERSISTENCE_METHODS
 
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serial( PactNature );
 		f.serial( PactType );
diff --git a/code/ryzom/server/src/entities_game_service/creature_manager/harvestable.h b/code/ryzom/server/src/entities_game_service/creature_manager/harvestable.h
index f966e6cb0..223b96edb 100644
--- a/code/ryzom/server/src/entities_game_service/creature_manager/harvestable.h
+++ b/code/ryzom/server/src/entities_game_service/creature_manager/harvestable.h
@@ -50,7 +50,7 @@ struct CCreatureRawMaterial
 	/**
 	 * Serial
 	 */
-	inline void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	inline void serial(NLMISC::IStream &f)
 	{
 		f.serial( MpCommon );
 		f.serial( Quantity );
@@ -88,7 +88,7 @@ public:
 	/**
 	 * Serial
 	 */
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serialCont( _Mps );
 		f.serialEnum( _HarvestSkill );
diff --git a/code/ryzom/server/src/entities_game_service/creature_manager/mp.h b/code/ryzom/server/src/entities_game_service/creature_manager/mp.h
index 0f94bca00..6c91d2773 100644
--- a/code/ryzom/server/src/entities_game_service/creature_manager/mp.h
+++ b/code/ryzom/server/src/entities_game_service/creature_manager/mp.h
@@ -59,7 +59,7 @@ public:
 	{}
 
 	/// serial
-	void serial(class NLMISC::IStream &f)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serial( Name );
 		f.serial( AssociatedItemName );
diff --git a/code/ryzom/server/src/entities_game_service/deposit.h b/code/ryzom/server/src/entities_game_service/deposit.h
index 24ca5830d..b409bda32 100644
--- a/code/ryzom/server/src/entities_game_service/deposit.h
+++ b/code/ryzom/server/src/entities_game_service/deposit.h
@@ -200,7 +200,7 @@ struct CDepositState {
 	float currentQuantity;
 	uint32 nextRespawnDay;
 	CDepositState() : alias(0), currentQuantity(0.f), nextRespawnDay(0) {}
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		if(f.isXML())
 		{
diff --git a/code/ryzom/server/src/entities_game_service/deposit_raw_material.h b/code/ryzom/server/src/entities_game_service/deposit_raw_material.h
index 967011ae2..de3766d33 100644
--- a/code/ryzom/server/src/entities_game_service/deposit_raw_material.h
+++ b/code/ryzom/server/src/entities_game_service/deposit_raw_material.h
@@ -34,7 +34,7 @@ struct CDepositRawMaterial
 	}
 
 	/// serialize
-//	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) 
+//	void serial(NLMISC::IStream &f) 
 //	{
 //	}
 };
diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_ai_action.cpp b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_ai_action.cpp
index 77ca67ac9..6f1ac0a9f 100644
--- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_ai_action.cpp
+++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_ai_action.cpp
@@ -206,7 +206,7 @@ namespace DURATION_TYPE
 //--------------------------------------------------------------
 //					CCombatParams::serial
 //--------------------------------------------------------------
-void CCombatParams::serial(class NLMISC::IStream &f)
+void CCombatParams::serial(NLMISC::IStream &f)
 {
 	f.serial(Melee);
 	f.serial(SpeedFactor);
@@ -325,7 +325,7 @@ void CCombatParams::readForm (const UFormElm &root, const NLMISC::CSheetId &shee
 //--------------------------------------------------------------
 //					CSpellParams::serial
 //--------------------------------------------------------------
-void CSpellParams::serial(class NLMISC::IStream &f)
+void CSpellParams::serial(NLMISC::IStream &f)
 {
 	f.serial(CastingTime);
 	f.serial(PostActionTime);
@@ -454,7 +454,7 @@ void COTSpellParams::readForm (const UFormElm &root, const NLMISC::CSheetId &she
 //--------------------------------------------------------------
 //					CEffectSpellParams::serial
 //--------------------------------------------------------------
-void CEffectSpellParams::serial(class NLMISC::IStream &f)
+void CEffectSpellParams::serial(NLMISC::IStream &f)
 {
 	CSpellParams::serial(f);
 
@@ -500,7 +500,7 @@ void CEffectSpellParams::readForm (const UFormElm &root, const NLMISC::CSheetId
 //--------------------------------------------------------------
 //					COTEffectSpellParams::serial
 //--------------------------------------------------------------
-void COTEffectSpellParams::serial(class NLMISC::IStream &f)
+void COTEffectSpellParams::serial(NLMISC::IStream &f)
 {
 	COTSpellParams::serial(f);
 		
@@ -534,7 +534,7 @@ void COTEffectSpellParams::readForm (const UFormElm &root, const NLMISC::CSheetI
 //--------------------------------------------------------------
 //				TAiArea::serial
 //--------------------------------------------------------------
-void TAiArea::serial(class NLMISC::IStream &f)
+void TAiArea::serial(NLMISC::IStream &f)
 {		
 	if (f.isReading() )
 	{
@@ -674,7 +674,7 @@ void CStaticAiAction::readGeorges (const NLMISC::CSmartPtr<NLGEORGES::UForm> &fo
 //--------------------------------------------------------------
 //					CStaticAiAction::readGeorges
 //--------------------------------------------------------------
-void CStaticAiAction::serial(class NLMISC::IStream &f)
+void CStaticAiAction::serial(NLMISC::IStream &f)
 {
 	f.serial(_SheetId);
 	
diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_ai_action.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_ai_action.h
index 4600e7b11..820f3f8cf 100644
--- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_ai_action.h
+++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_ai_action.h
@@ -145,7 +145,7 @@ struct CCombatParams
 	}
 
 	/// Serial
-	void serial(class NLMISC::IStream &f);
+	void serial(NLMISC::IStream &f);
 
 	/// read params from georges
 	void readForm (const NLGEORGES::UFormElm &root, const NLMISC::CSheetId &sheetId, AI_ACTION::TAiActionType type);
@@ -207,7 +207,7 @@ struct CSpellParams
 	}
 
 	/// Serial
-	void serial(class NLMISC::IStream &f);
+	void serial(NLMISC::IStream &f);
 
 	/// read params from georges
 	void readForm (const NLGEORGES::UFormElm &root, const NLMISC::CSheetId &sheetId, AI_ACTION::TAiActionType type);
@@ -253,7 +253,7 @@ struct COTSpellParams : public CSpellParams
 	}
 
 	/// Serial
-	void serial(class NLMISC::IStream &f)
+	void serial(NLMISC::IStream &f)
 	{
 		CSpellParams::serial(f);
 		f.serial(UpdateFrequency);
@@ -300,7 +300,7 @@ struct CEffectSpellParams : public CSpellParams
 	}
 
 	/// Serial
-	void serial(class NLMISC::IStream &f);
+	void serial(NLMISC::IStream &f);
 
 	/// read params from georges
 	void readForm (const NLGEORGES::UFormElm &root, const NLMISC::CSheetId &sheetId, AI_ACTION::TAiActionType type);
@@ -329,7 +329,7 @@ struct COTEffectSpellParams : public COTSpellParams
 	}
 
 	/// Serial
-	void serial(class NLMISC::IStream &f);
+	void serial(NLMISC::IStream &f);
 
 	/// read params from georges
 	void readForm (const NLGEORGES::UFormElm &root, const NLMISC::CSheetId &sheetId, AI_ACTION::TAiActionType type);
@@ -362,7 +362,7 @@ struct TAiArea
 	{}
 
 	/// Serial
-	void serial(class NLMISC::IStream &f);
+	void serial(NLMISC::IStream &f);
 	
 	/// read params from georges
 	void readForm (const NLGEORGES::UFormElm &root, const NLMISC::CSheetId &sheetId, AI_ACTION::TAiActionType type);
@@ -408,7 +408,7 @@ public:
 	inline static uint getVersion () { return 21; }
 
 	/// Serial
-	void serial(class NLMISC::IStream &f);
+	void serial(NLMISC::IStream &f);
 
 	/// Removed
 	void removed() {}
diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.cpp b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.cpp
index 749690e00..bed41d43d 100644
--- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.cpp
+++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.cpp
@@ -90,7 +90,7 @@ CStaticBrick::~CStaticBrick()
 //--------------------------------------------------------------
 //					serial()  
 //--------------------------------------------------------------
-void CStaticBrick::serial(class NLMISC::IStream &f)
+void CStaticBrick::serial(NLMISC::IStream &f)
 {
 	f.serial( Name );
 	f.serial( SheetId );
diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.h
index 0745848af..a6cbc5001 100644
--- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.h
+++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.h
@@ -104,7 +104,7 @@ public:
 		// Quantity of this Mp needed
 		uint16	Quantity;
 		
-		void serial(class NLMISC::IStream &f)
+		void serial(NLMISC::IStream &f)
 		{
 			f.serialEnum( MpType );
 			f.serial( Quantity );
@@ -118,7 +118,7 @@ public:
 		// Quantity of this Mp needed
 		uint16	Quantity;
 		
-		void serial(class NLMISC::IStream &f)
+		void serial(NLMISC::IStream &f)
 		{
 			f.serial( MpType );
 			f.serial( Quantity );
@@ -176,7 +176,7 @@ public:
 		AllowPartialSuccess= true;
 	}
 	
-	void serial(class NLMISC::IStream &f)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serial( CraftedItem );
 		f.serial( NbItemsPerUnit );
@@ -428,7 +428,7 @@ public:
 	virtual ~CStaticBrick();
 	
 	/// Serialisation
-	virtual void serial(class NLMISC::IStream &f);
+	virtual void serial(NLMISC::IStream &f);
 
 	/// read georges sheet
 	void readGeorges (const NLMISC::CSmartPtr<NLGEORGES::UForm> &form, const NLMISC::CSheetId &sheetId);
diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_deposit.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_deposit.h
index c7af1da7f..a7ad38f5d 100644
--- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_deposit.h
+++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_deposit.h
@@ -39,7 +39,7 @@ public:
 	NLMISC::CSheetId	MaterialSheet;
 	//uint16				MaxAmount;
 
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serial( MaterialSheet );
 		//f.serial( MaxAmount );
@@ -71,7 +71,7 @@ public :
 	void removed() {}
 	
 	/// Serialize deposit
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{}		
 };*/
 
diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_emot.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_emot.h
index ce0c388ad..92a4e1251 100644
--- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_emot.h
+++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_emot.h
@@ -40,7 +40,7 @@ public:
 	/// Return the version of this class, increments this value when the content of this class has changed
 	inline static uint getVersion () { return 1; }
 	/// Serial
-	void serial(class NLMISC::IStream &f)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serialCont( _Anims );
 		if (f.isReading())
diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_encyclo.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_encyclo.h
index 2a9b67180..2fee7560a 100644
--- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_encyclo.h
+++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_encyclo.h
@@ -46,7 +46,7 @@ public:
 	/// Return the version of this class, increments this value when the content of this class has changed
 	inline static uint getVersion () { return 1; }
 	/// Serial
-	void serial(class NLMISC::IStream &f)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serial( AlbumNumber );
 		f.serial( Title );
@@ -87,7 +87,7 @@ public:
 	/// Return the version of this class, increments this value when the content of this class has changed
 	inline static uint getVersion () { return 1; }
 	/// Serial
-	void serial(class NLMISC::IStream &f)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serial( ThemaNumber );
 		f.serial( Title );
diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.cpp b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.cpp
index 0c68fd804..5540c780d 100644
--- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.cpp
+++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.cpp
@@ -89,7 +89,7 @@ namespace GUILD_OPTION
 }
 
 //--------------------------------------------------------------
-void CCosmetics::serial(class NLMISC::IStream &f)
+void CCosmetics::serial(NLMISC::IStream &f)
 {
 	f.serial( VPValue );
 }
@@ -107,7 +107,7 @@ IItemServiceData * IItemServiceData::buildItemServiceData(ITEM_SERVICE_TYPE::TIt
 }
 
 //--------------------------------------------------------------
-void CConsumable::serial(class NLMISC::IStream &f)
+void CConsumable::serial(NLMISC::IStream &f)
 {
 	f.serial(LoopTimer);
 	f.serial(MaxNbLoops);
@@ -155,7 +155,7 @@ void CConsumable::serial(class NLMISC::IStream &f)
 
 
 //--------------------------------------------------------------
-void CXpCatalyser::serial(class NLMISC::IStream &f)
+void CXpCatalyser::serial(NLMISC::IStream &f)
 {
 	f.serial(IsRingCatalyser);
 	f.serial(XpBonus);
@@ -212,7 +212,7 @@ bool	SItemSpecialEffect::build(std::string const& str)
 	return false;
 }
 
-void SItemSpecialEffect::serial(class NLMISC::IStream &f)
+void SItemSpecialEffect::serial(NLMISC::IStream &f)
 {
 	// Don't forget to change the SItem version and the code here if no more 4.
 	nlctassert(MaxEffectPerItem==4);
@@ -229,7 +229,7 @@ void SItemSpecialEffect::serial(class NLMISC::IStream &f)
 	f.serial( EffectArgString[3] );
 }
 
-void SItemSpecialEffects::serial(class NLMISC::IStream &f)
+void SItemSpecialEffects::serial(NLMISC::IStream &f)
 {
 	f.serialCont(Effects);
 }
@@ -1223,7 +1223,7 @@ void loadCommandTicket( NLGEORGES::UFormElm &root, CStaticItem *item, const NLMI
 //--------------------------------------------------------------
 //						serial()  
 //--------------------------------------------------------------
-void CStaticItem::serial(class NLMISC::IStream &f)
+void CStaticItem::serial(NLMISC::IStream &f)
 {
 	f.serial( SheetId );
 	f.serialEnum( Origin );
diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.h
index a81d5502c..fecf65a31 100644
--- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.h
+++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.h
@@ -58,7 +58,7 @@ struct TCommandTicket
 	NL_INSTANCE_COUNTER_DECL(TCommandTicket);
 public:
 	
-	virtual void serial(class NLMISC::IStream &f)
+	virtual void serial(NLMISC::IStream &f)
 	{
 		f.serial( Command );
 		f.serial( Priviledge );
@@ -108,7 +108,7 @@ struct CGuildOption
 	NL_INSTANCE_COUNTER_DECL(CGuildOption);
 public:
 
-	virtual void serial(class NLMISC::IStream &f)
+	virtual void serial(NLMISC::IStream &f)
 	{
 //		f.serial( XpCost );
 		f.serial( MoneyCost );
@@ -142,7 +142,7 @@ public:
 
 	CConsumable() : Family(0), LoopTimer(0), MaxNbLoops(1), OverdoseTimer(0), Data(0), ConsumptionTime(0) {}
 
-	virtual void serial(class NLMISC::IStream &f);
+	virtual void serial(NLMISC::IStream &f);
 
 	uint16		Family; // consumable family, this is NOT PERSISTENT, use FAMILY AS A STRING
 
@@ -209,7 +209,7 @@ public:
 
 	CXpCatalyser() : IsRingCatalyser(false), XpBonus(100) {}
 
-	virtual void serial(class NLMISC::IStream &f);
+	virtual void serial(NLMISC::IStream &f);
 
 	// true if this catalyser comes from ring session
 	bool IsRingCatalyser;
@@ -223,7 +223,7 @@ struct CCosmetics
 	NL_INSTANCE_COUNTER_DECL(CCosmetics);
 public:
 
-	virtual void serial(class NLMISC::IStream &f);
+	virtual void serial(NLMISC::IStream &f);
 	uint32				VPValue;
 };
 
@@ -238,7 +238,7 @@ struct SItemSpecialEffect
 	SItemSpecialEffect() { }
 	// return false if the effect cannot be built. + warning inside
 	bool	build(std::string const& str);
-	virtual void serial(class NLMISC::IStream &f);
+	virtual void serial(NLMISC::IStream &f);
 };
 
 struct SItemSpecialEffects
@@ -247,7 +247,7 @@ struct SItemSpecialEffects
 public:
 	
 	std::vector<SItemSpecialEffect>	Effects;
-	virtual void serial(class NLMISC::IStream &f);
+	virtual void serial(NLMISC::IStream &f);
 };
 
 struct SWeapon
@@ -270,7 +270,7 @@ struct SWeapon
 	// damage factor (if fixed)
 	float					DamageFactor;
 
-	virtual void serial(class NLMISC::IStream &f)
+	virtual void serial(NLMISC::IStream &f)
 	{
 		f.serialEnum( WeaponType );
 		f.serialEnum( DamageType );
@@ -301,7 +301,7 @@ public:
 	/// 'length' value of the weapon (french 'allonge')
 	uint8	ReachValue;
 
-	virtual void serial(class NLMISC::IStream &f)
+	virtual void serial(NLMISC::IStream &f)
 	{
 		SWeapon::serial( f );
 		f.serial( RateOfFire );
@@ -317,7 +317,7 @@ public:
 
 	virtual ~SRangeWeapon() {}
 
-	virtual void serial(class NLMISC::IStream &f)
+	virtual void serial(NLMISC::IStream &f)
 	{
 		SWeapon::serial( f );
 		f.serialEnum(AreaType);
@@ -389,7 +389,7 @@ public:
 	// ammo type (1 or 2)
 	uint8	AmmoType;
 
-	virtual void serial(class NLMISC::IStream &f)
+	virtual void serial(NLMISC::IStream &f)
 	{
 		SWeapon::serial( f );
 		f.serial( ShortRangeLimit );
@@ -410,7 +410,7 @@ public:
 	inline SArmor() : ArmorType( ARMORTYPE::UNKNOWN ),Protections(DMGTYPE::NBTYPES){}
 
 	// serial
-	virtual void serial(class NLMISC::IStream &f)
+	virtual void serial(NLMISC::IStream &f)
 	{
 		f.serialEnum( ArmorType );
 		f.serialCont( Protections );
@@ -431,7 +431,7 @@ public:
 
 	inline SShield() : SArmor(),ShieldType(SHIELDTYPE::NONE),Unbreakable(false){}
 	
-	virtual void serial(class NLMISC::IStream &f)
+	virtual void serial(NLMISC::IStream &f)
 	{
 		SArmor::serial(f);
 		f.serialEnum( ShieldType );
@@ -580,7 +580,7 @@ public:
 			ChaScore4Buff = 0;
 		}
 
-		inline void serial(class NLMISC::IStream &f)
+		inline void serial(NLMISC::IStream &f)
 		{
 			f.serial( Durability );
 			f.serial( Weight );
@@ -647,7 +647,7 @@ public:
 		};
 	};
 
-	inline void serial(class NLMISC::IStream &f)
+	inline void serial(NLMISC::IStream &f)
 	{
 		f.serial( (uint32&)Family ); // The number never changes
 		f.serialEnum( Ecosystem );				
@@ -755,7 +755,7 @@ public:
 		MaxDonkeys = 0;
 	}
 	
-	inline void serial(class NLMISC::IStream &f)
+	inline void serial(NLMISC::IStream &f)
 	{
 		f.serialEnum( Type );
 		f.serial( CommandRange );
@@ -824,7 +824,7 @@ public:
 	virtual ~CStaticItem();
 
 	/// Serialisation
-	void serial(class NLMISC::IStream &f);
+	void serial(NLMISC::IStream &f);
 
 	/// read georges sheet
 	void readGeorges (const NLMISC::CSmartPtr<NLGEORGES::UForm> &form, const NLMISC::CSheetId &sheetId);
diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_sheet.cpp b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_sheet.cpp
index a00325840..c0cecaf78 100644
--- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_sheet.cpp
+++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_sheet.cpp
@@ -195,7 +195,7 @@ void CStaticGameBrick::readGeorges( const CSmartPtr<UForm> &form, const CSheetId
 // serial CStaticGameBrick
 //
 //-----------------------------------------------
-void CStaticGameBrick::serial( NLMISC::IStream &f ) throw(NLMISC::EStream)
+void CStaticGameBrick::serial( NLMISC::IStream &f )
 {
 	f.serial( FamilyId );
 	f.serial( IndexInFamily );
@@ -325,7 +325,7 @@ void CStaticXpStagesTable::readGeorges( const CSmartPtr<UForm> &form, const CShe
 }
 
 // Serial SXpStage structure
-void CStaticXpStagesTable::SXpStage::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CStaticXpStagesTable::SXpStage::serial(NLMISC::IStream &f)
 {
 	f.serial( SkillLevel );
 	f.serial( XpForPointSkill );
@@ -333,13 +333,13 @@ void CStaticXpStagesTable::SXpStage::serial(class NLMISC::IStream &f) throw(NLMI
 }
 
 // Serial SStageTable structure
-void CStaticXpStagesTable::SStageTable::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CStaticXpStagesTable::SStageTable::serial(NLMISC::IStream &f)
 {
 	f.serialCont( StageTable );
 }
 
 // Serial XpStagesTables structure
-void CStaticXpStagesTable::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CStaticXpStagesTable::serial(NLMISC::IStream &f)
 {
 	f.serialCont( XpStagesTables );
 }
@@ -910,7 +910,7 @@ uint CStaticCreatures::getVersion()
 }
 
 ///////////////////////////////////////////////////////////////////////////
-void CStaticCreatures::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) 
+void CStaticCreatures::serial(NLMISC::IStream &f) 
 {
 	CStaticHarvestable::serial(f);
 	
diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_sheet.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_sheet.h
index 6e42a3498..d564252f7 100644
--- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_sheet.h
+++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_sheet.h
@@ -126,7 +126,7 @@ public :
 	}
 
 	/// serial
-	void serial( NLMISC::IStream &f ) throw(NLMISC::EStream);
+	void serial( NLMISC::IStream &f );
 
 	/// called when the sheet is removed
 	void removed() {}
@@ -157,13 +157,13 @@ public :
 		uint32	XpForPointSkill;
 		float	SpPointMultiplier;
 		
-		void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+		void serial(NLMISC::IStream &f);
 	};
 
 	struct SStageTable
 	{
 		std::vector< SXpStage > StageTable;
-		void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+		void serial(NLMISC::IStream &f);
 	};
 
 
@@ -174,7 +174,7 @@ public :
 	static uint getVersion () { return 2; }
 
 	/// serialize
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 	// return a reference on Xp stage corresponding to level and stage table
 	const SXpStage* getXpStage( uint32 level, uint16 stage ) const;
@@ -206,7 +206,7 @@ public :
 		uint16	StageType;
 		float	Coeff;
 
-		void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) { f.serial( StageType); f.serial( Coeff ); }
+		void serial(NLMISC::IStream &f) { f.serial( StageType); f.serial( Coeff ); }
 	};
 
 	/// read sheet
@@ -216,7 +216,7 @@ public :
 	static uint getVersion () { return 2 + ( SKILLS::NUM_SKILLS << 16 ); }
 
 	/// serialize
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) { f.serialCont( SkillToStageType ); }
+	void serial(NLMISC::IStream &f) { f.serialCont( SkillToStageType ); }
 
 	/// destructor
 	virtual ~CStaticStagesTypeSkillTable() {}
@@ -245,7 +245,7 @@ public:
 		uint16	LoseSkillsLevel;
 		NLMISC::TGameCycle	Duration;
 
-		void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) 
+		void serial(NLMISC::IStream &f) 
 		{
 			f.serial( LoseChaScore1Level); 
 			f.serial( LoseChaScore2Level ); 
@@ -262,7 +262,7 @@ public:
 	static uint getVersion () { return 2; }
 
 	/// serialize
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) { f.serialCont( PactLose ); }
+	void serial(NLMISC::IStream &f) { f.serialCont( PactLose ); }
 
 	/// destructor
 	virtual ~CStaticPacts() {}
@@ -642,7 +642,7 @@ public:
 	static uint getVersion ();
 	
 	/// serialize
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 	
 	/// called when the sheet is removed
 	void removed() { }
@@ -673,7 +673,7 @@ public:
 	std::vector<NLMISC::CSheetId>	BricksIds;
 	
 	/// Serialisation
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serial( Name );
 		f.serialCont( BricksIds );
@@ -698,7 +698,7 @@ public:
 		SMirrorEquipment Ammo1;
 		SMirrorEquipment Ammo2;
 
-		void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) 
+		void serial(NLMISC::IStream &f) 
 		{
 			f.serial( Right );
 			f.serial( Left );
@@ -730,7 +730,7 @@ public:
 	float RunSpeed;
 
 	/// serialize
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) 
+	void serial(NLMISC::IStream &f) 
 	{
 		f.serialEnum( Race );
 		f.serial( Gender );
@@ -800,7 +800,7 @@ public:
 		uint16		Quantity;
 		
 		/// serialize
-		void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) 
+		void serial(NLMISC::IStream &f) 
 		{
 			f.serial( Item );
 			f.serial( Level );
@@ -811,7 +811,7 @@ public:
 	std::vector< SItemLoot > ItemLoot;
 
 	/// serialize
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) 
+	void serial(NLMISC::IStream &f) 
 	{
 		f.serialCont( ItemLoot );
 	}
@@ -857,7 +857,7 @@ public:
 	float	MoneyDropProbability;
 
 	/// serialize
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) 
+	void serial(NLMISC::IStream &f) 
 	{
 		f.serialCont( LootSets );
 		f.serial( MoneyLvlFactor );
@@ -908,7 +908,7 @@ public:
 		uint16		QuantityMax;
 
 		/// serialize
-		void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) 
+		void serial(NLMISC::IStream &f) 
 		{
 			f.serial( Item );
 			f.serial( Probability );
@@ -923,7 +923,7 @@ public:
 	std::vector< SItemLoot > ItemLoot;
 
 	/// serialize
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) 
+	void serial(NLMISC::IStream &f) 
 	{
 		f.serialCont( ItemLoot );
 	}
@@ -962,7 +962,7 @@ public:
 		std::string DefaultFeet;
 		std::string DefaultHair;
 
-		void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) 
+		void serial(NLMISC::IStream &f) 
 		{
 			f.serial( DefaultFace );
 			f.serial( DefaultChest );
@@ -990,7 +990,7 @@ public:
 	SDefaultEquipment FemaleDefaultEquipment;
 
 	/// serialize
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) 
+	void serial(NLMISC::IStream &f) 
 	{
 		f.serialEnum( Race );
 		for( int c = 0; c < CHARACTERISTICS::NUM_CHARACTERISTICS; ++c )
@@ -1048,7 +1048,7 @@ public:
 		NLMISC::CSheetId sentence;
 //		MEM_SET_TYPES::TMemorizationSetType memory;
 
-		void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) 
+		void serial(NLMISC::IStream &f) 
 		{
 			f.serial( sentence );
 //			f.serialEnum( memory );
@@ -1067,7 +1067,7 @@ public:
 
 	
 	/// serialize
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) 
+	void serial(NLMISC::IStream &f) 
 	{
 		f.serial( Role );
 		f.serialEnum( Race );
@@ -1127,7 +1127,7 @@ public :
 		SKILLS::ESkills	ParentSkill;
 		std::vector<SKILLS::ESkills> ChildSkills;
 
-		void serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+		void serial(NLMISC::IStream &f)
 		{
 			f.serialEnum( Skill );
 			f.serial( SkillCode );
@@ -1164,7 +1164,7 @@ public :
 	static uint getVersion () { return 1 + ( SKILLS::NUM_SKILLS << 16 ); }
 
 	/// serialize
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) { f.serialCont( SkillsTree ); }
+	void serial(NLMISC::IStream &f) { f.serialCont( SkillsTree ); }
 
 	/// destructor
 	virtual ~CStaticSkillsTree() {}
diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_guild_option.cpp b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_guild_option.cpp
index cbccc4f30..43c212b50 100644
--- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_guild_option.cpp
+++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_guild_option.cpp
@@ -56,7 +56,7 @@ void CStaticGuildOption::readGeorges (const NLMISC::CSmartPtr<NLGEORGES::UForm>
 	}
 }
 
-void CStaticGuildOption::serial(class NLMISC::IStream &f)
+void CStaticGuildOption::serial(NLMISC::IStream &f)
 {
 	f.serial(Price);
 	if ( f.isReading() )
diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_guild_option.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_guild_option.h
index a163d42da..2d765d96f 100644
--- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_guild_option.h
+++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_guild_option.h
@@ -64,7 +64,7 @@ public:
 	void readGeorges (const NLMISC::CSmartPtr<NLGEORGES::UForm> &form, const NLMISC::CSheetId &sheetId);
 
 	/// Serial
-	void serial(class NLMISC::IStream &f);
+	void serial(NLMISC::IStream &f);
 
 	/// Return the version of this class, increments this value when the content of this class has changed
 	inline static uint getVersion () { return 1; }
diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_harvestable.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_harvestable.h
index f23803bd3..8eafbe75b 100644
--- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_harvestable.h
+++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_harvestable.h
@@ -57,7 +57,7 @@ struct CStaticCreatureRawMaterial
 	/**
 	 * Serial
 	 */
-	inline void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	inline void serial(NLMISC::IStream &f)
 	{
 		f.serial( MpCommon );
 		f.serial( UsageAndQuantity );
@@ -129,7 +129,7 @@ public:
 	/**
 	 * Serial
 	 */
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serialEnum( _HarvestSkill );
 		f.serialCont( _Mps );
diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_outpost.cpp b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_outpost.cpp
index 146d4bae3..06149ccf0 100644
--- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_outpost.cpp
+++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_outpost.cpp
@@ -165,7 +165,7 @@ void CStaticOutpostBuilding::CDriller::readGeorges (const NLGEORGES::UFormElm *p
 }
 
 //----------------------------------------------------------------------------
-void CStaticOutpostBuilding::CDriller::serial(class NLMISC::IStream &f)
+void CStaticOutpostBuilding::CDriller::serial(NLMISC::IStream &f)
 {
 	for (uint i = 0; i < DRILLER_NB_LEVEL; ++i)
 		f.serial(QualityFactor[i]);
diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_outpost.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_outpost.h
index 414116557..7650f1fe6 100644
--- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_outpost.h
+++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_outpost.h
@@ -117,7 +117,7 @@ public:
 	/// Read georges sheet
 	void readGeorges (const NLMISC::CSmartPtr<NLGEORGES::UForm> &form, const NLMISC::CSheetId &sheetId);
 	/// Serial
-	void serial(class NLMISC::IStream &f);
+	void serial(NLMISC::IStream &f);
 	/// Return the version of this class, increments this value when the content of this class has changed
 	static uint getVersion ();
 	
@@ -151,7 +151,7 @@ public:
 	/// Read georges sheet
 	void readGeorges (const NLMISC::CSmartPtr<NLGEORGES::UForm> &form, const NLMISC::CSheetId &sheetId);
 	/// Serial
-	void serial(class NLMISC::IStream &f);
+	void serial(NLMISC::IStream &f);
 	/// Return the version of this class, increments this value when the content of this class has changed
 	static uint getVersion ();
 	
diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_raw_material.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_raw_material.h
index 5656493d0..f38ee61c3 100644
--- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_raw_material.h
+++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_raw_material.h
@@ -48,7 +48,7 @@ public:
 	{}
 
 	/// serial
-	void serial(class NLMISC::IStream &f)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serial( Name );
 		f.serial( AssociatedItemName );
diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_rolemaster_phrase.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_rolemaster_phrase.h
index 7436164da..d643b1824 100644
--- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_rolemaster_phrase.h
+++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_rolemaster_phrase.h
@@ -43,7 +43,7 @@ public:
 	inline static uint getVersion () { return 4; }
 
 	/// Serial
-	void serial(class NLMISC::IStream &f)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serialCont( Bricks );
 		std::vector<NLMISC::CSheetId>::const_iterator ib;
diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_success_table.cpp b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_success_table.cpp
index e5cb7a0be..51ae3a021 100644
--- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_success_table.cpp
+++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_success_table.cpp
@@ -134,7 +134,7 @@ void CStaticSuccessTable::initTables()
 //--------------------------------------------------------------
 // serial
 //--------------------------------------------------------------
-void CStaticSuccessTable::serial(class NLMISC::IStream &f)
+void CStaticSuccessTable::serial(NLMISC::IStream &f)
 {
 	f.serial(_MaxSuccessFactor);
 	f.serial(_MaxPartialSuccessFactor);
diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_success_table.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_success_table.h
index 6ff111278..a03fcdca4 100644
--- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_success_table.h
+++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_success_table.h
@@ -66,7 +66,7 @@ struct CSuccessXpLine
 	uint8	PartialSuccessMaxDraw;
 	float	XpGain;
 	
-	void serial(class NLMISC::IStream &f)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serial(RelativeLevel);
 		f.serial(SuccessProbability);
@@ -85,7 +85,7 @@ class CStaticSuccessTable
 {
 public:	
 	/// Serialisation
-	virtual void serial(class NLMISC::IStream &f);
+	virtual void serial(NLMISC::IStream &f);
 	
 	/// read georges sheet
 	void readGeorges (const NLMISC::CSmartPtr<NLGEORGES::UForm> &form, const NLMISC::CSheetId &sheetId);
diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_text_emotes.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_text_emotes.h
index 64b237d73..8c6eacfb1 100644
--- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_text_emotes.h
+++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_text_emotes.h
@@ -69,7 +69,7 @@ public:
 		/// true if this emote can be launched from client UI
 		bool UsableFromClientUI;
 		
-		void serial(class NLMISC::IStream &f)
+		void serial(NLMISC::IStream &f)
 		{
 			f.serial( EmoteId );
 			f.serial( TargetCrowd );
@@ -92,7 +92,7 @@ public:
 	/// Return the version of this class, increments this value when the content of this class has changed
 	inline static uint getVersion () { return 2; }
 	/// Serial
-	void serial(class NLMISC::IStream &f)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serialCont( _Phrases );
 		if (f.isReading())
diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_world.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_world.h
index 5ea379b3c..d928b313a 100644
--- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_world.h
+++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_world.h
@@ -40,7 +40,7 @@ public:
 	/// Return the version of this class, increments this value when the content of this class has changed
 	inline static uint getVersion () { return 1; }
 	/// Serial
-	void serial(class NLMISC::IStream &f)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serialCont( Continents );
 	}
@@ -68,7 +68,7 @@ public:
 	/// Return the version of this class, increments this value when the content of this class has changed
 	inline static uint getVersion () { return 1; }
 	/// Serial
-	void serial(class NLMISC::IStream &f)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serialCont(Outposts);
 	}
diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_xp_factor_table.cpp b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_xp_factor_table.cpp
index 4d63d74a4..921fcbcd7 100644
--- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_xp_factor_table.cpp
+++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_xp_factor_table.cpp
@@ -29,7 +29,7 @@ using namespace NLGEORGES;
 //--------------------------------------------------------------
 // serial
 //--------------------------------------------------------------
-void CStaticXpFactorTable::serial(class NLMISC::IStream &f)
+void CStaticXpFactorTable::serial(NLMISC::IStream &f)
 {
 	f.serialCont(_XpFactorTable);
 } // serial //
diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_xp_factor_table.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_xp_factor_table.h
index 7ced3ddf5..3515fa104 100644
--- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_xp_factor_table.h
+++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_xp_factor_table.h
@@ -36,7 +36,7 @@ class CStaticXpFactorTable
 {
 public:	
 	/// Serialisation
-	virtual void serial(class NLMISC::IStream &f);
+	virtual void serial(NLMISC::IStream &f);
 	
 	/// read georges sheet
 	void readGeorges (const NLMISC::CSmartPtr<NLGEORGES::UForm> &form, const NLMISC::CSheetId &sheetId);
diff --git a/code/ryzom/server/src/entities_game_service/egs_static_continent.h b/code/ryzom/server/src/entities_game_service/egs_static_continent.h
index 85db06c8e..3427a0b98 100644
--- a/code/ryzom/server/src/entities_game_service/egs_static_continent.h
+++ b/code/ryzom/server/src/entities_game_service/egs_static_continent.h
@@ -27,7 +27,7 @@ class CStaticWorld
 {
 public:
 	/// Serialisation
-	void serial(class NLMISC::IStream &f);
+	void serial(NLMISC::IStream &f);
 	
 	/// read georges sheet
 	void readGeorges (const NLMISC::CSmartPtr<NLGEORGES::UForm> &form, const NLMISC::CSheetId &sheetId);
diff --git a/code/ryzom/server/src/entities_game_service/entity_manager/entity_base.cpp b/code/ryzom/server/src/entities_game_service/entity_manager/entity_base.cpp
index 4a717e096..bc9a252b5 100644
--- a/code/ryzom/server/src/entities_game_service/entity_manager/entity_base.cpp
+++ b/code/ryzom/server/src/entities_game_service/entity_manager/entity_base.cpp
@@ -120,7 +120,7 @@ CEquipmentSlots::CEquipmentSlots()
 // serial CEquipmentSlots properties:
 //
 //-----------------------------------------------
-void CEquipmentSlots::serial( NLMISC::IStream &f ) throw(NLMISC::EStream)
+void CEquipmentSlots::serial( NLMISC::IStream &f )
 {
 	f.serial( Headdress );
 	f.serial( Head );
@@ -1450,7 +1450,7 @@ void CEntityBase::setBehaviour( MBEHAV::CBehaviour behaviour, bool forceUpdate )
 //---------------------------------------------------
 // serial: reading off-mirror, writing from mirror
 //---------------------------------------------------
-void CEntityBase::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CEntityBase::serial(NLMISC::IStream &f)
 {
 	f.xmlPush("CEntityBasePart");
 	f.xmlPush("CEntityBasePartVersion");
diff --git a/code/ryzom/server/src/entities_game_service/entity_manager/entity_base.h b/code/ryzom/server/src/entities_game_service/entity_manager/entity_base.h
index a519c4d92..44cf98626 100644
--- a/code/ryzom/server/src/entities_game_service/entity_manager/entity_base.h
+++ b/code/ryzom/server/src/entities_game_service/entity_manager/entity_base.h
@@ -98,7 +98,7 @@ struct CEquipmentSlots
 	/**
 	 * Serial
 	 */
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 };
 
 
@@ -387,7 +387,7 @@ public:
 	/**
 	 * Serial: reading off-mirror, writing from mirror
 	 */
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 	/**
 	 * Load George Sheet
diff --git a/code/ryzom/server/src/entities_game_service/entity_structure/entity_persistant_data.cpp b/code/ryzom/server/src/entities_game_service/entity_structure/entity_persistant_data.cpp
index 2526a899a..4622c3d44 100644
--- a/code/ryzom/server/src/entities_game_service/entity_structure/entity_persistant_data.cpp
+++ b/code/ryzom/server/src/entities_game_service/entity_structure/entity_persistant_data.cpp
@@ -30,14 +30,14 @@ using namespace NLMISC;
 //---------------------------------------------------
 // serial: serial persistant part of CEntityBase for player character
 //---------------------------------------------------
-void CEntityBasePersistantData::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CEntityBasePersistantData::serial(NLMISC::IStream &f)
 {
 }
 
 //---------------------------------------------------
 // serialXml: serial persistant part of CEntityBase for player character
 //---------------------------------------------------
-void CEntityBasePersistantData::serialXml(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CEntityBasePersistantData::serialXml(NLMISC::IStream &f)
 {
 	f.xmlPush("CEntityBasePart");
 	f.xmlPush("CEntityBasePartVersion");
diff --git a/code/ryzom/server/src/entities_game_service/entity_structure/entity_persistant_data.h b/code/ryzom/server/src/entities_game_service/entity_structure/entity_persistant_data.h
index 0e4fda066..20fec9c70 100644
--- a/code/ryzom/server/src/entities_game_service/entity_structure/entity_persistant_data.h
+++ b/code/ryzom/server/src/entities_game_service/entity_structure/entity_persistant_data.h
@@ -57,8 +57,8 @@ public:
 	static inline uint16 getCurrentVersion(){ return 6; }
 
 	// serial: reading off-mirror, writing from mirror
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
-	void serialXml(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
+	void serialXml(NLMISC::IStream &f);
 	
 
 	// Entity state ( X, Y, Z,T )
diff --git a/code/ryzom/server/src/entities_game_service/entity_structure/resists.cpp b/code/ryzom/server/src/entities_game_service/entity_structure/resists.cpp
index b8f195857..40f370d01 100644
--- a/code/ryzom/server/src/entities_game_service/entity_structure/resists.cpp
+++ b/code/ryzom/server/src/entities_game_service/entity_structure/resists.cpp
@@ -34,7 +34,7 @@ uint16 CCreatureResists::ImmuneScore = 0xffff;
 //--------------------------------------------------------------
 //					serial() 
 //--------------------------------------------------------------
-void CCreatureResists::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CCreatureResists::serial(NLMISC::IStream &f)
 {
 	f.serial(Fear);
 	f.serial(Sleep);
diff --git a/code/ryzom/server/src/entities_game_service/entity_structure/resists.h b/code/ryzom/server/src/entities_game_service/entity_structure/resists.h
index f89253435..16b5d5682 100644
--- a/code/ryzom/server/src/entities_game_service/entity_structure/resists.h
+++ b/code/ryzom/server/src/entities_game_service/entity_structure/resists.h
@@ -53,7 +53,7 @@ public:
 	{}
 
 	/// serialize
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 public:
 	/// static value indicating the immune score (when someone cannot be affected at all by an effect type)
diff --git a/code/ryzom/server/src/entities_game_service/entity_structure/role_persistant_data.h b/code/ryzom/server/src/entities_game_service/entity_structure/role_persistant_data.h
index 2e6e420df..6c1d069de 100644
--- a/code/ryzom/server/src/entities_game_service/entity_structure/role_persistant_data.h
+++ b/code/ryzom/server/src/entities_game_service/entity_structure/role_persistant_data.h
@@ -39,7 +39,7 @@
 //		
 //		SSkillsProgress() { LevelReached = SkillCap = 0; }
 //		
-//		void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+//		void serial(NLMISC::IStream &f)
 //		{
 //			f.serial( LevelReached );
 //			f.serial( SkillCap );
@@ -57,7 +57,7 @@
 //		uint16				JobLevel;
 //		NLMISC::CSheetId	RoleSheet;
 //		
-//		void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+//		void serial(NLMISC::IStream &f)
 //		{
 //			f.serialEnum( Job );
 //			f.serialEnum( JobStatus );
@@ -79,7 +79,7 @@
 //	};	
 //	
 //	// Serial
-//	void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+//	void serial(NLMISC::IStream &f)
 //	{
 //		f.serialCont( _Roles );
 //		f.serialCont( _LevelReached );
diff --git a/code/ryzom/server/src/entities_game_service/entity_structure/special_modifier.cpp b/code/ryzom/server/src/entities_game_service/entity_structure/special_modifier.cpp
index 58859eb09..463683a64 100644
--- a/code/ryzom/server/src/entities_game_service/entity_structure/special_modifier.cpp
+++ b/code/ryzom/server/src/entities_game_service/entity_structure/special_modifier.cpp
@@ -85,7 +85,7 @@ void CSpecialModifiers::init()
 //-----------------------------------------------
 // CSpecialModifiers::serial
 //-----------------------------------------------
-void CSpecialModifiers::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CSpecialModifiers::serial(NLMISC::IStream &f)
 {
 	f.serial( MeleeAttackModifierOnEnemy );
 	f.serial( MeleeAttackModifierOnSelf );
diff --git a/code/ryzom/server/src/entities_game_service/entity_structure/special_modifier.h b/code/ryzom/server/src/entities_game_service/entity_structure/special_modifier.h
index e38153f33..60615cd50 100644
--- a/code/ryzom/server/src/entities_game_service/entity_structure/special_modifier.h
+++ b/code/ryzom/server/src/entities_game_service/entity_structure/special_modifier.h
@@ -123,7 +123,7 @@ struct CSpecialModifiers
 	/**
 	 * Serial
 	 */
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 	/**
 	 * init all the special modifiers
diff --git a/code/ryzom/server/src/entities_game_service/entity_structure/statistic.cpp b/code/ryzom/server/src/entities_game_service/entity_structure/statistic.cpp
index fe81ac0ff..7de7a06c3 100644
--- a/code/ryzom/server/src/entities_game_service/entity_structure/statistic.cpp
+++ b/code/ryzom/server/src/entities_game_service/entity_structure/statistic.cpp
@@ -100,7 +100,7 @@ SCharacteristicsAndScores::~SCharacteristicsAndScores()
 //-----------------------------------------------
 // SCharacteristicsAndScores serial
 //-----------------------------------------------
-void SCharacteristicsAndScores::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void SCharacteristicsAndScores::serial(NLMISC::IStream &f)
 {
 	f.serial( Base );
 	f.serial( Max );
@@ -139,7 +139,7 @@ void CPhysicalCharacteristics::clear()
 //-----------------------------------------------
 // serial :
 //-----------------------------------------------
-void CPhysicalCharacteristics::serial( NLMISC::IStream &f ) throw(NLMISC::EStream)
+void CPhysicalCharacteristics::serial( NLMISC::IStream &f )
 {
 	for(int i = 0; i < CHARACTERISTICS::NUM_CHARACTERISTICS; ++i )
 	{
@@ -180,7 +180,7 @@ void CPhysicalScores::clear()
 //-----------------------------------------------
 // serial :
 //-----------------------------------------------
-void CPhysicalScores::serial( NLMISC::IStream &f ) throw(NLMISC::EStream)
+void CPhysicalScores::serial( NLMISC::IStream &f )
 {
 	for( int i = 0; i < SCORES::NUM_SCORES; ++i )
 	{
@@ -267,7 +267,7 @@ void CSkills::clear()
 // serial :
 //
 //-----------------------------------------------
-void CSkills::serial( NLMISC::IStream &f ) throw(NLMISC::EStream)
+void CSkills::serial( NLMISC::IStream &f )
 {
 	uint32 size = SKILLS::NUM_SKILLS;
 	f.serial( size );
diff --git a/code/ryzom/server/src/entities_game_service/entity_structure/statistic.h b/code/ryzom/server/src/entities_game_service/entity_structure/statistic.h
index 6afed0e90..d3bccd11d 100644
--- a/code/ryzom/server/src/entities_game_service/entity_structure/statistic.h
+++ b/code/ryzom/server/src/entities_game_service/entity_structure/statistic.h
@@ -79,7 +79,7 @@ struct SCharacteristicsAndScores
 	float						KeepRegenerateDecimal;
 	
 	// Serial
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 	
 	// Constructor
 	SCharacteristicsAndScores();
@@ -119,7 +119,7 @@ struct CPhysicalCharacteristics
 	/**
 	 * Serial
 	 */
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 	/**
 	 * getCharacteristicStruct
@@ -165,7 +165,7 @@ struct CPhysicalScores
 	/**
 	 * Serial
 	 */
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 	std::vector< SCharacteristicsAndScores > _PhysicalScores;
 };
@@ -209,7 +209,7 @@ struct SSkill
 	/**
 	 * Serial
 	 */
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serial( Base );
 		f.serial( Modifier );
@@ -254,7 +254,7 @@ struct CSkills
 	/**
 	 * Serial
 	 */
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 	void clear();
 
diff --git a/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp b/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp
index 1515abd17..fc16d902c 100644
--- a/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp
+++ b/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp
@@ -298,7 +298,7 @@ RM_FABER_STAT_TYPE::TRMStatType CItemCraftParameters::getBestItemStat() const
 }
 
 	/// serial validated point for a character
-void CItemCraftParameters::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CItemCraftParameters::serial(NLMISC::IStream &f)
 {
 	uint32 version = CItemCraftParameters::getCurrentVersion();
 	f.serial( version );
diff --git a/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.h b/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.h
index 0df25069d..dff3ae5ac 100644
--- a/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.h
+++ b/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.h
@@ -233,7 +233,7 @@ struct CItemCraftParameters
 	static inline uint32 getCurrentVersion() { return 4; }
 
 	/// serial validated point for a character
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 	// operator !=
 	bool operator!=(const CItemCraftParameters &p) const;
diff --git a/code/ryzom/server/src/entities_game_service/harvest_info.h b/code/ryzom/server/src/entities_game_service/harvest_info.h
index a932fc4c1..3c4d7c037 100644
--- a/code/ryzom/server/src/entities_game_service/harvest_info.h
+++ b/code/ryzom/server/src/entities_game_service/harvest_info.h
@@ -36,7 +36,7 @@ struct CHarvestInfos
 	CHarvestInfos() : EndCherchingTime(0xffffffff), DepositIndex(0xffffffff), DepositIndexContent(0), Quantity(0),MinQuality(0),MaxQuality(0)
 	{}
 
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serial( EndCherchingTime );
 		f.serial( Sheet );
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character.cpp b/code/ryzom/server/src/entities_game_service/player_manager/character.cpp
index da8c1596f..df8a41a22 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/character.cpp
+++ b/code/ryzom/server/src/entities_game_service/player_manager/character.cpp
@@ -2613,7 +2613,7 @@ void CCharacter::compassDatabaseUpdate()
 // serial: reading off-mirror, writing from mirror
 //
 //---------------------------------------------------
-void CCharacter::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CCharacter::serial(NLMISC::IStream &f)
 {
 	nlerror("Serial method no longer exists!");
 
@@ -18638,7 +18638,7 @@ void CPetAnimal::clear()
 }
 
 //-----------------------------------------------------------------------------
-void CPetAnimal::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPetAnimal::serial(NLMISC::IStream &f)
 {
 	// ensure we won't save in this format anymore
 	nlassertex( f.isReading(), ("<CPetAnimal::serial> you should not save in old format anymore!!!") );
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character.h b/code/ryzom/server/src/entities_game_service/player_manager/character.h
index 73ad6c67c..66e9248f0 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/character.h
+++ b/code/ryzom/server/src/entities_game_service/player_manager/character.h
@@ -183,7 +183,7 @@ struct SGameCoordinate
 	sint32	Cell;
 	uint8 Continent;
 
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serial( X );
 		f.serial( Y );
@@ -304,7 +304,7 @@ struct CPetAnimal
 	CPetAnimal();
 
 	void clear();
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 	// init found ticket item pointer with slot
 	uint32 initLinkAnimalToTicket( CCharacter * c, uint8 index);
@@ -660,7 +660,7 @@ public:
 	/**
 	 * Serial: reading off-mirror, writing from mirror
 	 */
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 	// set player position to default respawn point of continent
 	void setPositionToDefaultRespawnPoint();
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/known_and_memorized_phrases.cpp b/code/ryzom/server/src/entities_game_service/player_manager/known_and_memorized_phrases.cpp
index 86de5efa8..62d44decc 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/known_and_memorized_phrases.cpp
+++ b/code/ryzom/server/src/entities_game_service/player_manager/known_and_memorized_phrases.cpp
@@ -55,7 +55,7 @@ void CKnownPhrase::clear()
 //-----------------------------------------------
 // CKnownPhrase::serial
 //-----------------------------------------------
-void CKnownPhrase::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CKnownPhrase::serial(NLMISC::IStream &f)
 {
 	f.serial(PhraseDesc);
 	f.serial(PhraseSheetId);
@@ -89,7 +89,7 @@ void CMemorizedPhrase::clear()
 //-----------------------------------------------
 // CMemorizedPhrase::serial
 //-----------------------------------------------
-void CMemorizedPhrase::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CMemorizedPhrase::serial(NLMISC::IStream &f)
 {
 	f.serialCont(Bricks);
 	f.serial(PhraseId);
@@ -347,7 +347,7 @@ void CMemorizationSet::forgetAll()
 //-----------------------------------------------
 // CMemorizationSet::serial
 //-----------------------------------------------
-void CMemorizationSet::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CMemorizationSet::serial(NLMISC::IStream &f)
 {
 	f.serialContPtr(Phrases);
 }
@@ -511,7 +511,7 @@ void CPlayerPhraseMemory::forgetAll()
 //-----------------------------------------------
 // CPlayerPhraseMemory::serial
 //-----------------------------------------------
-void CPlayerPhraseMemory::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPlayerPhraseMemory::serial(NLMISC::IStream &f)
 {
 	f.serialContPtr(_MemSets);
 }
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/known_and_memorized_phrases.h b/code/ryzom/server/src/entities_game_service/player_manager/known_and_memorized_phrases.h
index ec6050cae..758c7f6f8 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/known_and_memorized_phrases.h
+++ b/code/ryzom/server/src/entities_game_service/player_manager/known_and_memorized_phrases.h
@@ -46,7 +46,7 @@ struct CKnownPhrase
 
 	bool empty() const;
 	void clear();
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 };
 
 
@@ -70,7 +70,7 @@ public:
 	explicit CMemorizedPhrase(const std::vector<NLMISC::CSheetId> &bricks, uint16 id);
 
 	void clear();
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 	std::vector<NLMISC::CSheetId>	Bricks;
 	uint16							PhraseId;
@@ -119,7 +119,7 @@ public:
 	
 	const std::vector<CMemorizedPhrase*>	&getMemorizedPhrases() const { return Phrases; }
 
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 private:
 	std::vector<CMemorizedPhrase*>	Phrases;
@@ -174,7 +174,7 @@ struct CPlayerPhraseMemory
 
 	const std::vector<CMemorizationSet*>	&getMemorizationSets() const { return _MemSets; }
 
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 private:
 	CMemorizationSet* getMemSet(uint32 idx);
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/modifiers_in_db.cpp b/code/ryzom/server/src/entities_game_service/player_manager/modifiers_in_db.cpp
index 66793c08f..cd0bd75f9 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/modifiers_in_db.cpp
+++ b/code/ryzom/server/src/entities_game_service/player_manager/modifiers_in_db.cpp
@@ -43,7 +43,7 @@ void CModifierInDB::init()
 	clear();
 }
 
-void CModifierInDB::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CModifierInDB::serial(NLMISC::IStream &f)
 {
 	f.serial(Disabled);
 	if(Disabled) 
@@ -70,7 +70,7 @@ void CModifiersInDB::clear()
 		Malus[i].clear();
 }	
 
-void CModifiersInDB::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CModifiersInDB::serial(NLMISC::IStream &f)
 {
 	f.serialCont(Bonus);
 	f.serialCont(Malus);
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/modifiers_in_db.h b/code/ryzom/server/src/entities_game_service/player_manager/modifiers_in_db.h
index 7d60876d8..fd6b6159e 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/modifiers_in_db.h
+++ b/code/ryzom/server/src/entities_game_service/player_manager/modifiers_in_db.h
@@ -45,7 +45,7 @@ struct CModifierInDB
 
 	void init();
 
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 };
 
 /// struct for disabled modifiers
@@ -66,7 +66,7 @@ struct CModifiersInDB
 
 	void clear();
 
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 	// write disabled effects in DB, used only in initDatabase
 	void writeInDatabase(CCDBSynchronised &database);
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/powers_and_auras.cpp b/code/ryzom/server/src/entities_game_service/player_manager/powers_and_auras.cpp
index 7c9108bc6..6ec0dabe7 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/powers_and_auras.cpp
+++ b/code/ryzom/server/src/entities_game_service/player_manager/powers_and_auras.cpp
@@ -28,7 +28,7 @@
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-void CPowerActivationDate::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPowerActivationDate::serial(NLMISC::IStream &f)
 {
 	f.serial( DeactivationDate );
 	f.serial( ActivationDate );
@@ -69,7 +69,7 @@ void CPowerActivationDateVector::clearConsumable()
 }
 
 //-----------------------------------------------------------------------------
-void CPowerActivationDateVector::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CPowerActivationDateVector::serial(NLMISC::IStream &f)
 {
 	if (f.isReading())
 	{
@@ -200,7 +200,7 @@ void CAuraActivationDateVector::disableAura(POWERS::TPowerType type, NLMISC::TGa
 }
 
 //-----------------------------------------------------------------------------
-void CAuraActivationDateVector::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CAuraActivationDateVector::serial(NLMISC::IStream &f)
 {
 	if (f.isReading())
 	{
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/powers_and_auras.h b/code/ryzom/server/src/entities_game_service/player_manager/powers_and_auras.h
index 8061d91b1..9feca7c84 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/powers_and_auras.h
+++ b/code/ryzom/server/src/entities_game_service/player_manager/powers_and_auras.h
@@ -43,7 +43,7 @@ struct CPowerActivationDate
 	CPowerActivationDate(POWERS::TPowerType type, uint16 consumableFamilyId, NLMISC::TGameCycle dateOff, NLMISC::TGameCycle dateOn) : PowerType(type), ConsumableFamilyId(consumableFamilyId), DeactivationDate(dateOff), ActivationDate(dateOn)
 	{}
 
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 };
 
 /**
@@ -70,7 +70,7 @@ struct CPowerActivationDateVector
 	/// remove only consumable entries
 	void clearConsumable();
 
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 	/// remove entries for which date has been reached
 	void cleanVector();
@@ -110,7 +110,7 @@ public:
 
 	void disableAura(POWERS::TPowerType type, NLMISC::TGameCycle startDate, NLMISC::TGameCycle endDate, const NLMISC::CEntityId &userId);
 
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 	/// remove entries for which date has been reached
 	void cleanVector();
diff --git a/code/ryzom/server/src/entities_game_service/position_flag_manager.cpp b/code/ryzom/server/src/entities_game_service/position_flag_manager.cpp
index 1904ed2a0..8583bfdba 100644
--- a/code/ryzom/server/src/entities_game_service/position_flag_manager.cpp
+++ b/code/ryzom/server/src/entities_game_service/position_flag_manager.cpp
@@ -65,7 +65,7 @@ bool CPositionFlagManager::flagExists(const std::string & flagName) const
 	return (_FlagPositions.find(flagName) != _FlagPositions.end());
 }
 
-void CPositionFlagManager::serial(NLMISC::IStream & f) throw(NLMISC::EStream)
+void CPositionFlagManager::serial(NLMISC::IStream & f)
 {
 	H_AUTO(CPositionFlagManagerSerial);
 
diff --git a/code/ryzom/server/src/entities_game_service/position_flag_manager.h b/code/ryzom/server/src/entities_game_service/position_flag_manager.h
index 4a43374ce..336ac4b06 100644
--- a/code/ryzom/server/src/entities_game_service/position_flag_manager.h
+++ b/code/ryzom/server/src/entities_game_service/position_flag_manager.h
@@ -51,7 +51,7 @@ public:
 	bool flagExists(const std::string & flagName) const;
 
 	/// serial flags and their positions
-	void serial(NLMISC::IStream & f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream & f);
 
 	/// save flags to the given file
 	void saveToFile(const std::string & fileName);
diff --git a/code/ryzom/server/src/sabrina/static_sabrina_bricks.h b/code/ryzom/server/src/sabrina/static_sabrina_bricks.h
index 97c7da0e8..ec2515d12 100644
--- a/code/ryzom/server/src/sabrina/static_sabrina_bricks.h
+++ b/code/ryzom/server/src/sabrina/static_sabrina_bricks.h
@@ -207,7 +207,7 @@ struct CSabrinaBrickCraftInfo
 		// Quantity of this Mp needed
 		uint8	Quantity;
 		
-		void serial(class NLMISC::IStream &f)
+		void serial(NLMISC::IStream &f)
 		{
 			f.serialEnum( MpFamily );
 			f.serialEnum( MpType );
@@ -223,7 +223,7 @@ struct CSabrinaBrickCraftInfo
 		NbItemsPerUnit = 1;
 	}
 	
-	void serial(class NLMISC::IStream &f)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serialEnum( Skill );
 		f.serialEnum( ToolType );
@@ -382,7 +382,7 @@ public:
 	virtual ~CStaticBrick();
 	
 	/// Serialisation
-	virtual void serial(class NLMISC::IStream &f);
+	virtual void serial(NLMISC::IStream &f);
 
 	/// read georges sheet
 	void readGeorges (const NLMISC::CSmartPtr<NLGEORGES::UForm> &form, const NLMISC::CSheetId &sheetId);
diff --git a/code/ryzom/server/src/server_share/entity_state.h b/code/ryzom/server/src/server_share/entity_state.h
index cb68c4427..d681e51ce 100644
--- a/code/ryzom/server/src/server_share/entity_state.h
+++ b/code/ryzom/server/src/server_share/entity_state.h
@@ -97,7 +97,7 @@ public:
 	/**
 	 * Serial (read to temp storage, or write from mirror)
 	 */
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		X.serialRTWM( f );
 		Y.serialRTWM( f );
diff --git a/code/ryzom/server/src/server_share/event_report.h b/code/ryzom/server/src/server_share/event_report.h
index 4574b1608..9414912ae 100644
--- a/code/ryzom/server/src/server_share/event_report.h
+++ b/code/ryzom/server/src/server_share/event_report.h
@@ -69,7 +69,7 @@ struct SEventReport
 	}
 
 	/// Serialisation
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serial( ActingEntity );
 		f.serial( TargetEntity );
diff --git a/code/ryzom/server/src/server_share/mirror_equipment.h b/code/ryzom/server/src/server_share/mirror_equipment.h
index 3ede9e4e9..206ebeff8 100644
--- a/code/ryzom/server/src/server_share/mirror_equipment.h
+++ b/code/ryzom/server/src/server_share/mirror_equipment.h
@@ -68,7 +68,7 @@ public:
 		return ( IdSheet != e.IdSheet || Quality != e.Quality);
 	}
 
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serial( IdSheet );
 		f.serial( Quality );
diff --git a/code/ryzom/server/src/server_share/testing_tool_structures.h b/code/ryzom/server/src/server_share/testing_tool_structures.h
index 3e0b02bb1..2a56b05f2 100644
--- a/code/ryzom/server/src/server_share/testing_tool_structures.h
+++ b/code/ryzom/server/src/server_share/testing_tool_structures.h
@@ -47,7 +47,7 @@ struct SActorBeginTest
 	std::vector< NLMISC::CSheetId > Sentence2;
 	std::vector< NLMISC::CSheetId > Sentence3;
 
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 //		f.serial( Role );
 //		f.serial( Level );
@@ -90,7 +90,7 @@ struct SLogReport
 	uint32	ChaScore2Left; //
 	uint32	ChaScore3Left;
 
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	void serial(NLMISC::IStream &f)
 	{
 		f.serialCont( UsedBrick );
 		f.serial( Stop );
diff --git a/code/ryzom/server/src/shard_unifier_service/name_manager.h b/code/ryzom/server/src/shard_unifier_service/name_manager.h
index 83e203d15..92854ee44 100644
--- a/code/ryzom/server/src/shard_unifier_service/name_manager.h
+++ b/code/ryzom/server/src/shard_unifier_service/name_manager.h
@@ -177,7 +177,7 @@ public:
 			return ((UserId < charSlot.UserId) || (UserId == charSlot.UserId && CharIndex < charSlot.CharIndex));
 		}
 
-		void serial(NLMISC::IStream & f) throw(NLMISC::EStream)
+		void serial(NLMISC::IStream & f)
 		{
 			f.serial( UserId );
 			f.serial( CharIndex );
@@ -209,7 +209,7 @@ private:
 			return ShardId < other.ShardId;
 		}
 	
-		void serial(NLMISC::IStream & f) throw(NLMISC::EStream)
+		void serial(NLMISC::IStream & f)
 		{
 			f.serial( GuildId );
 			f.serial( ShardId );
diff --git a/code/ryzom/tools/client/client_patcher/main.cpp b/code/ryzom/tools/client/client_patcher/main.cpp
index 76fcc495b..fc440abf4 100644
--- a/code/ryzom/tools/client/client_patcher/main.cpp
+++ b/code/ryzom/tools/client/client_patcher/main.cpp
@@ -21,7 +21,7 @@ CClientConfig::CClientConfig()
 {
 }
 
-void CClientConfig::serial(class NLMISC::IStream &/* f */) throw(NLMISC::EStream)
+void CClientConfig::serial(NLMISC::IStream &/* f */)
 {
 }
 
diff --git a/code/ryzom/tools/phrase_generator/skill_tree.h b/code/ryzom/tools/phrase_generator/skill_tree.h
index 2839d35a3..90c78b0d8 100644
--- a/code/ryzom/tools/phrase_generator/skill_tree.h
+++ b/code/ryzom/tools/phrase_generator/skill_tree.h
@@ -55,7 +55,7 @@ public :
 		SKILLS::ESkills	ParentSkill;
 		std::vector<SKILLS::ESkills> ChildSkills;
 
-		void serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+		void serial(NLMISC::IStream &f)
 		{
 			f.serialEnum( Skill );
 			f.serial( SkillCode );
@@ -92,7 +92,7 @@ public :
 	static uint getVersion () { return 1 + ( SKILLS::NUM_SKILLS << 16 ); }
 
 	/// serialize
-	void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) { f.serialCont( SkillsTree ); }
+	void serial(NLMISC::IStream &f) { f.serialCont( SkillsTree ); }
 
 	/// destructor
 	virtual ~CStaticSkillsTree() {}
diff --git a/code/ryzom/tools/sheets_packer/sheets_packer_cfg.cpp b/code/ryzom/tools/sheets_packer/sheets_packer_cfg.cpp
index b415205ce..913b09b7d 100644
--- a/code/ryzom/tools/sheets_packer/sheets_packer_cfg.cpp
+++ b/code/ryzom/tools/sheets_packer/sheets_packer_cfg.cpp
@@ -221,7 +221,7 @@ void setValues()
 // serial :
 // Serialize CFG.
 //-----------------------------------------------
-void CClientConfig::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
+void CClientConfig::serial(NLMISC::IStream &f)
 {
 	// Start the opening of a new node named ClientCFG.
 	f.xmlPush("ClientCFG");
diff --git a/code/ryzom/tools/sheets_packer/sheets_packer_cfg.h b/code/ryzom/tools/sheets_packer/sheets_packer_cfg.h
index dc100658c..bc3fcb439 100644
--- a/code/ryzom/tools/sheets_packer/sheets_packer_cfg.h
+++ b/code/ryzom/tools/sheets_packer/sheets_packer_cfg.h
@@ -64,7 +64,7 @@ public:
 	friend void setValues ();
 
 	/// Serialize CFG.
-	virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream);
+	virtual void serial(NLMISC::IStream &f);
 
 	/// End process
 	void release ();
diff --git a/code/studio/src/plugins/object_viewer/particle_system/dup_ps.cpp b/code/studio/src/plugins/object_viewer/particle_system/dup_ps.cpp
index 086607fac..f3c4d6db1 100644
--- a/code/studio/src/plugins/object_viewer/particle_system/dup_ps.cpp
+++ b/code/studio/src/plugins/object_viewer/particle_system/dup_ps.cpp
@@ -39,7 +39,7 @@ using namespace NL3D;
   * TODO maybe this could be used elsewhere ?
   */
 template <class TSerializePolicy, typename T>
-static T	*DupSerializable(const T *in) throw(NLMISC::EStream)
+static T	*DupSerializable(const T *in)
 {
 	NLMISC::CMemStream ms;
 	nlassert(!ms.isReading());
@@ -61,7 +61,7 @@ static T	*DupSerializable(const T *in) throw(NLMISC::EStream)
 struct CDupObjPolicy
 {
 	template <typename T>
-	static void serial(T *&obj, NLMISC::IStream &dest)  throw(NLMISC::EStream)
+	static void serial(T *&obj, NLMISC::IStream &dest)
 	{
 		dest.serialPtr(obj);
 		/*if (dest.isReading())
@@ -83,7 +83,7 @@ struct CDupObjPolicy
 struct CDupPolymorphicObjPolicy
 {
 	template <typename T>
-	static void serial(T *&obj, NLMISC::IStream &dest)  throw(NLMISC::EStream)
+	static void serial(T *&obj, NLMISC::IStream &dest)
 	{
 		dest.serialPolyPtr(obj);
 	}
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_node.cpp b/code/studio/src/plugins/object_viewer/particle_system/particle_node.cpp
index 084358f52..7bffe2fa3 100644
--- a/code/studio/src/plugins/object_viewer/particle_system/particle_node.cpp
+++ b/code/studio/src/plugins/object_viewer/particle_system/particle_node.cpp
@@ -240,12 +240,12 @@ void CWorkspaceNode::serial(NLMISC::IStream &f)
 	f.xmlPop();
 }
 
-void CWorkspaceNode::savePS() throw(NLMISC::EStream)
+void CWorkspaceNode::savePS()
 {
 	savePSAs(getFullPath());
 }
 
-void CWorkspaceNode::savePSAs(const std::string &fullPath) throw(NLMISC::EStream)
+void CWorkspaceNode::savePSAs(const std::string &fullPath)
 {
 	nlassert(_WS);
 	if (!_PS) return;
@@ -263,7 +263,7 @@ std::string CWorkspaceNode::getFullPath() const
 	return _WS->getPath() + _RelativePath.c_str();
 }
 
-bool CWorkspaceNode::loadPS() throw(NLMISC::EStream)
+bool CWorkspaceNode::loadPS()
 {
 	nlassert(_WS);
 	// manually load the PS shape (so that we can deal with exceptions)
@@ -390,7 +390,7 @@ void CParticleWorkspace::removeNode(CWorkspaceNode *ptr)
 	removeNode((uint) index);
 }
 
-void CParticleWorkspace::save() throw(NLMISC::EStream)
+void CParticleWorkspace::save()
 {
 	NLMISC::COFile stream;
 	stream.open(_Filename);
@@ -400,7 +400,7 @@ void CParticleWorkspace::save() throw(NLMISC::EStream)
 	clearModifiedFlag();
 }
 
-void CParticleWorkspace::load() throw(NLMISC::EStream)
+void CParticleWorkspace::load()
 {
 	NLMISC::CIFile stream;
 	stream.open(_Filename);
@@ -410,7 +410,7 @@ void CParticleWorkspace::load() throw(NLMISC::EStream)
 	clearModifiedFlag();
 }
 
-void CParticleWorkspace::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CParticleWorkspace::serial(NLMISC::IStream &f)
 {
 	f.xmlPush("PARTICLE_WORKSPACE");
 	f.serialVersion(0);
diff --git a/code/studio/src/plugins/object_viewer/particle_system/particle_node.h b/code/studio/src/plugins/object_viewer/particle_system/particle_node.h
index 9ae36fd49..033802a44 100644
--- a/code/studio/src/plugins/object_viewer/particle_system/particle_node.h
+++ b/code/studio/src/plugins/object_viewer/particle_system/particle_node.h
@@ -80,17 +80,17 @@ public:
 	void serial(NLMISC::IStream &f);
 
 	/// Save the particle system target file
-	void savePS() throw(NLMISC::EStream);
+	void savePS();
 
 	/// Save particle system with an arbitrary filename
-	void savePSAs(const std::string &fullPath) throw(NLMISC::EStream);
+	void savePSAs(const std::string &fullPath);
 
 	/// put back in the unloaded state
 	void unload();
 
 	/// Load the particle system target file
 	/// @return true if loading succeed (false means that loading was ok, but this is not a particle system). Other cases throw an exception.
-	bool loadPS() throw(NLMISC::EStream);
+	bool loadPS();
 
 	/// Create an empty particle system
 	void createEmptyPS();
@@ -296,11 +296,11 @@ public:
 
 	/// Save the workspace structure. The target file is the one given when this object was created
 	/// NB : ps shape are not saved, only the structure is. To save the shapes, call CNode::save()
-	void save() throw(NLMISC::EStream);
+	void save();
 
 	/// Load the workspace structure. The target file is the one given when this object was created
 	/// All nodes are in the 'unloaded" state, so it is to the caller to load them by calling load() on their node
-	void load() throw(NLMISC::EStream);
+	void load();
 
 	/// Test whether the structure of the workspace has been modified (does not test if ps inside the workspace have been modified)
 	bool isModified() const
@@ -348,7 +348,7 @@ private:
 	std::string	_Name;
 
 	/// serial the object
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 
 	/// set the 'modified flag' and call the callback
 	void setModifiedFlag(bool modified);
diff --git a/code/studio/src/plugins/object_viewer/particle_system/scheme_manager.cpp b/code/studio/src/plugins/object_viewer/particle_system/scheme_manager.cpp
index b859d9d66..e9f0e77b9 100644
--- a/code/studio/src/plugins/object_viewer/particle_system/scheme_manager.cpp
+++ b/code/studio/src/plugins/object_viewer/particle_system/scheme_manager.cpp
@@ -47,7 +47,7 @@ void CSchemeManager::getSchemes(const std::string &type, std::vector<TSchemeInfo
 	}
 }
 
-void CSchemeManager::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+void CSchemeManager::serial(NLMISC::IStream &f)
 {
 
 	f.serialCheck(NELID("_GNM"));
diff --git a/code/studio/src/plugins/object_viewer/particle_system/scheme_manager.h b/code/studio/src/plugins/object_viewer/particle_system/scheme_manager.h
index 03ddb3a56..e162b95f9 100644
--- a/code/studio/src/plugins/object_viewer/particle_system/scheme_manager.h
+++ b/code/studio/src/plugins/object_viewer/particle_system/scheme_manager.h
@@ -43,7 +43,7 @@ public:
 	// get all the schemes with the given type
 	void getSchemes(const std::string &type, std::vector<TSchemeInfo> &dest);
 	// serial this collection
-	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
+	void serial(NLMISC::IStream &f);
 	// swap this collection with another one
 	void	swap(CSchemeManager &other);
 	// remove a scheme from the bank, given a pointer on it