summaryrefslogtreecommitdiff
path: root/indra/newview/tests
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/tests
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/tests')
-rw-r--r--indra/newview/tests/llviewerhelputil_test.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/tests/llviewerhelputil_test.cpp b/indra/newview/tests/llviewerhelputil_test.cpp
index 90e3e7a7e0..68743357a6 100644
--- a/indra/newview/tests/llviewerhelputil_test.cpp
+++ b/indra/newview/tests/llviewerhelputil_test.cpp
@@ -36,7 +36,7 @@
#include "../test/lltut.h"
#include "../llviewerhelputil.h"
-#include "../llviewerversion.h"
+#include "../llversioninfo.h"
#include "llcontrol.h"
#include "llsys.h"
@@ -76,7 +76,11 @@ std::string LLControlGroup::getString(const std::string& name)
return test_stringvec[name];
}
-const std::string &llGetViewerVersion()
+S32 LLVersionInfo::getMajor() { return 2; }
+S32 LLVersionInfo::getMinor() { return 0; }
+S32 LLVersionInfo::getPatch() { return 0; }
+S32 LLVersionInfo::getBuild() { return 200099; }
+const std::string &LLVersionInfo::getVersion()
{
static std::string version = "2.0.0.200099";
return version;