From f7462aaf46bfb020553f05c6f8fc975fe47a8c67 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Sat, 14 Feb 2015 15:19:49 +0100
Subject: [PATCH] Merge with hotfix

---
 .../src/interface_v3/interface_manager.cpp      |  4 ++--
 code/ryzom/client/src/user_agent.cpp            | 17 ++++++++++++++---
 code/ryzom/client/src/user_agent.h              |  2 ++
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/code/ryzom/client/src/interface_v3/interface_manager.cpp b/code/ryzom/client/src/interface_v3/interface_manager.cpp
index 95fadc802..11bf6a8ef 100644
--- a/code/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/code/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -467,8 +467,8 @@ CInterfaceManager::CInterfaceManager()
 
 	CGroupHTML::options.trustedDomains = ClientCfg.WebIgTrustedDomains;
 	CGroupHTML::options.languageCode = ClientCfg.getHtmlLanguageCode();
-	CGroupHTML::options.appName = "Ryzom";
-	CGroupHTML::options.appVersion = getUserAgent();
+	CGroupHTML::options.appName = getUserAgentName();
+	CGroupHTML::options.appVersion = getUserAgentVersion();
 
 	NLGUI::CDBManager::getInstance()->resizeBanks( NB_CDB_BANKS );
 	interfaceLinkUpdater = new CInterfaceLink::CInterfaceLinkUpdater();
diff --git a/code/ryzom/client/src/user_agent.cpp b/code/ryzom/client/src/user_agent.cpp
index af07e8b86..1452aa584 100644
--- a/code/ryzom/client/src/user_agent.cpp
+++ b/code/ryzom/client/src/user_agent.cpp
@@ -21,7 +21,7 @@
 
 #include "game_share/ryzom_version.h"
 
-#ifdef HAVE_REVISION_H
+#if defined(RYZOM_COMPATIBILITY_VERSION) && defined(HAVE_REVISION_H)
 #include "revision.h"
 #endif
 
@@ -45,6 +45,16 @@
 #endif
 
 std::string getUserAgent()
+{
+	return getUserAgentName() + "/" + getUserAgentVersion();
+}
+
+std::string getUserAgentName()
+{
+	return "Ryzom";
+}
+
+std::string getUserAgentVersion()
 {
 	static std::string s_userAgent;
 
@@ -52,8 +62,9 @@ std::string getUserAgent()
 	{
 		char buffer[256];
 
-#ifdef REVISION
-		sprintf(buffer, "%s.%s-%s-%s", RYZOM_VERSION, REVISION, RYZOM_SYSTEM, RYZOM_ARCH);
+#if defined(REVISION) && defined(RYZOM_COMPATIBILITY_VERSION)
+		// 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
 		sprintf(buffer, "%s-%s-%s", RYZOM_VERSION, RYZOM_SYSTEM, RYZOM_ARCH);
 #endif
diff --git a/code/ryzom/client/src/user_agent.h b/code/ryzom/client/src/user_agent.h
index e42635871..bc508273d 100644
--- a/code/ryzom/client/src/user_agent.h
+++ b/code/ryzom/client/src/user_agent.h
@@ -18,6 +18,8 @@
 #define CL_USER_AGENT_H
 
 std::string getUserAgent();
+std::string getUserAgentName();
+std::string getUserAgentVersion();
 
 #endif // CL_USER_AGENT_H