summaryrefslogtreecommitdiff
path: root/indra/newview/tests
diff options
context:
space:
mode:
authorPalmer <palmer@lindenlab.com>2009-12-08 10:00:32 -0800
committerPalmer <palmer@lindenlab.com>2009-12-08 10:00:32 -0800
commit74f2cb2a70ddad7fe8819fd6855831e0615dc8d5 (patch)
tree61f2ce7a6cfb5963b7517a582164047a6833757b /indra/newview/tests
parentcd138869d5bfcf40d3d13d7b887e36263e2919d9 (diff)
parente07ef0d0e0e8cbd58afd4c6ee970634bd2f783e7 (diff)
Grabbed more viewer 2 changes that should fix parabuild problem
Diffstat (limited to 'indra/newview/tests')
-rw-r--r--indra/newview/tests/llviewerhelputil_test.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/tests/llviewerhelputil_test.cpp b/indra/newview/tests/llviewerhelputil_test.cpp
index 988d28c301..68743357a6 100644
--- a/indra/newview/tests/llviewerhelputil_test.cpp
+++ b/indra/newview/tests/llviewerhelputil_test.cpp
@@ -36,6 +36,7 @@
#include "../test/lltut.h"
#include "../llviewerhelputil.h"
+#include "../llversioninfo.h"
#include "llcontrol.h"
#include "llsys.h"
@@ -75,6 +76,16 @@ std::string LLControlGroup::getString(const std::string& name)
return test_stringvec[name];
}
+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;
+}
+
//----------------------------------------------------------------------------
namespace tut