Merge with develop

--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2015-11-22 18:42:36 +01:00
commit 2c71549aff
5 changed files with 45 additions and 4 deletions

View file

@ -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)

View file

@ -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

View file

@ -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;

View file

@ -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") )
{

Binary file not shown.

Before

Width:  |  Height:  |  Size: 142 KiB

After

Width:  |  Height:  |  Size: 157 KiB