Merge from default branch.

--HG--
branch : product-engine

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;