summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerhome.cpp
diff options
context:
space:
mode:
authorLynx Linden <lynx@lindenlab.com>2009-12-08 14:56:19 +0000
committerLynx Linden <lynx@lindenlab.com>2009-12-08 14:56:19 +0000
commit98111a40ec907f994841d2b934246d8096317f60 (patch)
tree6828cc6c59900833aedadbf46c3c8fd5fc613e93 /indra/newview/llviewerhome.cpp
parent06429722acae74a856589ccf92d31c2e10b0832d (diff)
DEV-43439: Created new LLVersionInfo API.
Renamed llviewerversion to llversioninfo, to avoid confusion with llversionviewer in llcommon (llversion is already used by llwindow). Created new LLVersionInfo class with the following methods: static S32 getMajor(); static S32 getMinor(); static S32 getPatch(); static S32 getBuild(); static const std::string &getVersion(); static const std::string &getShortVersion(); static const std::string &getChannel(); All viewer code has been updated to use this API. Viewer code no longer directly includes llversionviewer.h from llcommon.
Diffstat (limited to 'indra/newview/llviewerhome.cpp')
-rw-r--r--indra/newview/llviewerhome.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerhome.cpp b/indra/newview/llviewerhome.cpp
index 4556c3c5b1..58630978c4 100644
--- a/indra/newview/llviewerhome.cpp
+++ b/indra/newview/llviewerhome.cpp
@@ -38,7 +38,7 @@
#include "llui.h"
#include "lluri.h"
#include "llsd.h"
-#include "llviewerversion.h"
+#include "llversioninfo.h"
#include "llviewercontrol.h"
#include "llviewernetwork.h"
@@ -49,7 +49,7 @@ std::string LLViewerHome::getHomeURL()
// this value from settings.xml and support various substitutions
LLSD substitution;
- substitution["VERSION"] = llGetViewerVersion();
+ substitution["VERSION"] = LLVersionInfo::getVersion();
substitution["CHANNEL"] = LLURI::escape(gSavedSettings.getString("VersionChannelName"));
substitution["LANGUAGE"] = LLUI::getLanguage();
substitution["AUTH_KEY"] = LLURI::escape(getAuthKey());