diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-08 16:20:25 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-08 16:20:25 -0500 |
commit | 45b24808657dddfb2a605186416409b453f149e7 (patch) | |
tree | 298c49cfd6fb4f645a3a776a75b9bb64601bf9c3 /indra/newview/tests/llviewerhelputil_test.cpp | |
parent | 7ce49586881fd078ea8bceeab558b4a156b30f63 (diff) | |
parent | 37848d29d9030e00086c3a499d28237cdf943e1b (diff) |
merge
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/tests/llviewerhelputil_test.cpp')
-rw-r--r-- | indra/newview/tests/llviewerhelputil_test.cpp | 11 |
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 |