aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-22 23:26:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with hotfix

Browse source
This commit is contained in:
kervala 2015-02-14 15:19:49 +01:00
commit 68e56e02b2
3 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/ryzom/client/src/interface_v3/interface_manager.cpp
View file

@ -467,8 +467,8 @@ CInterfaceManager::CInterfaceManager()
CGroupHTML::options.trustedDomains = ClientCfg.WebIgTrustedDomains; CGroupHTML::options.trustedDomains = ClientCfg.WebIgTrustedDomains;
CGroupHTML::options.languageCode = ClientCfg.getHtmlLanguageCode(); CGroupHTML::options.languageCode = ClientCfg.getHtmlLanguageCode();
CGroupHTML::options.appName = "Ryzom"; CGroupHTML::options.appName = getUserAgentName();
CGroupHTML::options.appVersion = getUserAgent(); CGroupHTML::options.appVersion = getUserAgentVersion();
NLGUI::CDBManager::getInstance()->resizeBanks( NB_CDB_BANKS ); NLGUI::CDBManager::getInstance()->resizeBanks( NB_CDB_BANKS );
interfaceLinkUpdater = new CInterfaceLink::CInterfaceLinkUpdater(); interfaceLinkUpdater = new CInterfaceLink::CInterfaceLinkUpdater();

17
code/ryzom/client/src/user_agent.cpp
View file

@ -21,7 +21,7 @@
#include "game_share/ryzom_version.h" #include "game_share/ryzom_version.h"
#ifdef HAVE_REVISION_H #if defined(RYZOM_COMPATIBILITY_VERSION) && defined(HAVE_REVISION_H)
#include "revision.h" #include "revision.h"
#endif #endif
@ -45,6 +45,16 @@
#endif #endif
std::string getUserAgent() std::string getUserAgent()
{
return getUserAgentName() + "/" + getUserAgentVersion();
}
std::string getUserAgentName()
{
return "Ryzom";
}
std::string getUserAgentVersion()
{ {
static std::string s_userAgent; static std::string s_userAgent;
@ -52,8 +62,9 @@ std::string getUserAgent()
{ {
char buffer[256]; char buffer[256];
#ifdef REVISION #if defined(REVISION) && defined(RYZOM_COMPATIBILITY_VERSION)
sprintf(buffer, "%s.%s-%s-%s", RYZOM_VERSION, REVISION, RYZOM_SYSTEM, RYZOM_ARCH); // we don't need RYZOM_VERSION if we already have a numeric form a.b.c, we just need to append revision to it
sprintf(buffer, "%s.%s-%s-%s", RYZOM_COMPATIBILITY_VERSION, REVISION, RYZOM_SYSTEM, RYZOM_ARCH);
#else #else
sprintf(buffer, "%s-%s-%s", RYZOM_VERSION, RYZOM_SYSTEM, RYZOM_ARCH); sprintf(buffer, "%s-%s-%s", RYZOM_VERSION, RYZOM_SYSTEM, RYZOM_ARCH);
#endif #endif

2
code/ryzom/client/src/user_agent.h
View file

@ -18,6 +18,8 @@
#define CL_USER_AGENT_H #define CL_USER_AGENT_H
std::string getUserAgent(); std::string getUserAgent();
std::string getUserAgentName();
std::string getUserAgentVersion();
#endif // CL_USER_AGENT_H #endif // CL_USER_AGENT_H