Merge with develop

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

@@ -350,6 +350,12 @@ bool CDriverGL::init (uintptr_t windowIcon, emptyProc exitFunc)
 
 	nlunreferenced(windowIcon);
 
+	// allow several threads to access X functions
+	if (XInitThreads() == 0)
+	{
+		nlwarning("XInitThreads failed");
+	}
+
 	_dpy = XOpenDisplay(NULL);
 
 	if (_dpy == NULL)

code/ryzom/client/src/client.rc

@@ -164,6 +164,41 @@ IDB_ERROR_LOGO          BITMAP  DISCARDABLE     "error_logo.bmp"
 #endif    // French (France) resources
 /////////////////////////////////////////////////////////////////////////////
 
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION 2,1,0
+PRODUCTVERSION 2,1,0
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#else
+FILEFLAGS 0x0L
+#endif
+FILEOS VOS__WINDOWS32
+FILETYPE VFT_APP
+FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "FileDescription", "Ryzom client"
+            VALUE "FileVersion", "2.1.0"
+            VALUE "LegalCopyright", "Copyright (C) 2004-2015 Winchgate and The Ryzom Core Community"
+#ifdef _DEBUG
+            VALUE "OriginalFilename", "ryzom_client_d.exe"
+#else
+            VALUE "OriginalFilename", "ryzom_client_r.exe"
+#endif			
+            VALUE "ProductName", "Ryzom"
+            VALUE "ProductVersion", "2.1.0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1252
+    END
+END
+
 
 
 #ifndef APSTUDIO_INVOKED

code/ryzom/client/src/far_tp.cpp

@@ -569,7 +569,7 @@ void CLoginStateMachine::run()
 			break;
 		case st_disconnect:
 			// Far TP part 2: disconnect from the FS and unload shard-specific data (called from farTPmainLoop())
-			FarTP.disconnectFromPreviousShard();
+			// FarTP.disconnectFromPreviousShard();
 
 			SM_BEGIN_EVENT_TABLE
 				SM_EVENT(ev_connect, st_reconnect_fs);
@@ -1406,6 +1406,9 @@ void CFarTP::farTPmainLoop()
 {
 	ConnectionReadySent = false;
 	LoginSM.pushEvent(CLoginStateMachine::ev_far_tp_main_loop_entered);
+
+	disconnectFromPreviousShard();
+
 	uint nbRecoSelectCharReceived = 0;
 
 	bool welcomeWindow = true;

code/ryzom/client/src/login_progress_post_thread.cpp

@@ -337,9 +337,6 @@ void CLoginProgressPostThread::init(NLMISC::CConfigFile &configFile)
 	std::string installStartupPage;
 	std::string installStartupHost;
 	static std::string httpStr = "http://";
-	// The url where the stats system are has changed from
-	// http://r2linux03:80/login2/client_install.php (using InstallStartupPage and StartupPage )
-	// http://r2linux03:80/stats/stats.php (using InstallStatsUrl
 
 	if (configFile.getVarPtr("InstallStatsUrl") )
 	{