summaryrefslogtreecommitdiff
path: root/indra/newview/tests/llviewerhelputil_test.cpp
diff options
context:
space:
mode:
authorLynx Linden <lynx@lindenlab.com>2009-12-07 20:36:51 +0000
committerLynx Linden <lynx@lindenlab.com>2009-12-07 20:36:51 +0000
commit374aa101ab0296d9bed3e7c592e4820930042f6e (patch)
treefc42ce05b185a8c046d3a8f63a090818a3fe897d /indra/newview/tests/llviewerhelputil_test.cpp
parentee159d8e742a7281f304fc45b692c111706d294e (diff)
parent24cba353a45f6c261169fcda03cb9ac860ef8d9f (diff)
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview/tests/llviewerhelputil_test.cpp')
-rw-r--r--indra/newview/tests/llviewerhelputil_test.cpp7
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