diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-08 15:27:20 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-08 15:27:20 +0200 |
commit | d87c492d721c448ce8676dc568731ae389df46f3 (patch) | |
tree | 209c898da569532711fb6a981e548c3948caa279 /indra/newview/tests/llviewerhelputil_test.cpp | |
parent | 75993e09bf90e8a9d380192268cd6e0e149a70e2 (diff) | |
parent | 06429722acae74a856589ccf92d31c2e10b0832d (diff) |
Merge from default branch.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/tests/llviewerhelputil_test.cpp')
-rw-r--r-- | indra/newview/tests/llviewerhelputil_test.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/tests/llviewerhelputil_test.cpp b/indra/newview/tests/llviewerhelputil_test.cpp index 988d28c301..90e3e7a7e0 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 "../llviewerversion.h" #include "llcontrol.h" #include "llsys.h" @@ -75,6 +76,12 @@ std::string LLControlGroup::getString(const std::string& name) return test_stringvec[name]; } +const std::string &llGetViewerVersion() +{ + static std::string version = "2.0.0.200099"; + return version; +} + //---------------------------------------------------------------------------- namespace tut |