Merge branch 'master' into DRTVWR-513-maint

# Conflicts:
#	indra/llcommon/llerror.cpp
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llimprocessing.cpp
#	indra/newview/llviewerjoystick.cpp

2 files changed, 12 insertions, 14 deletions

diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp
index 2edad30493..57f2d31eab 100644
--- a/indra/newview/tests/lllogininstance_test.cpp
+++ b/indra/newview/tests/lllogininstance_test.cpp
@@ -202,8 +202,6 @@ void LLUIColorTable::saveUserSettings(void)const {}
 
 //-----------------------------------------------------------------------------
 #include "../llversioninfo.h"
-const std::string &LLVersionInfo::getVersion() { return VIEWERLOGIN_VERSION; }
-const std::string &LLVersionInfo::getChannel() { return VIEWERLOGIN_CHANNEL; }
 
 bool llHashedUniqueID(unsigned char* id) 
 {
diff --git a/indra/newview/tests/llversioninfo_test.cpp b/indra/newview/tests/llversioninfo_test.cpp
index 58f0469552..51a6f8f113 100644
--- a/indra/newview/tests/llversioninfo_test.cpp
+++ b/indra/newview/tests/llversioninfo_test.cpp
@@ -83,39 +83,39 @@ namespace tut
 	void versioninfo_object_t::test<1>()
 	{   
 		std::cout << "What we parsed from CMake: " << LL_VIEWER_VERSION_BUILD << std::endl;
-		std::cout << "What we get from llversioninfo: " << LLVersionInfo::getBuild() << std::endl;
+		std::cout << "What we get from llversioninfo: " << LLVersionInfo::instance().getBuild() << std::endl;
 		ensure_equals("Major version", 
-					  LLVersionInfo::getMajor(), 
+					  LLVersionInfo::instance().getMajor(), 
 					  LL_VIEWER_VERSION_MAJOR);
 		ensure_equals("Minor version", 
-					  LLVersionInfo::getMinor(), 
+					  LLVersionInfo::instance().getMinor(), 
 					  LL_VIEWER_VERSION_MINOR);
 		ensure_equals("Patch version", 
-					  LLVersionInfo::getPatch(), 
+					  LLVersionInfo::instance().getPatch(), 
 					  LL_VIEWER_VERSION_PATCH);
 		ensure_equals("Build version", 
-					  LLVersionInfo::getBuild(), 
+					  LLVersionInfo::instance().getBuild(), 
 					  LL_VIEWER_VERSION_BUILD);
 		ensure_equals("Channel version", 
-					  LLVersionInfo::getChannel(), 
+					  LLVersionInfo::instance().getChannel(), 
 					  ll_viewer_channel);
 		ensure_equals("Version String", 
-					  LLVersionInfo::getVersion(), 
+					  LLVersionInfo::instance().getVersion(), 
 					  mVersion);
 		ensure_equals("Short Version String", 
-					  LLVersionInfo::getShortVersion(), 
+					  LLVersionInfo::instance().getShortVersion(), 
 					  mShortVersion);
 		ensure_equals("Version and channel String", 
-					  LLVersionInfo::getChannelAndVersion(), 
+					  LLVersionInfo::instance().getChannelAndVersion(), 
 					  mVersionAndChannel);
 
-		LLVersionInfo::resetChannel(mResetChannel);
+		LLVersionInfo::instance().resetChannel(mResetChannel);
 		ensure_equals("Reset channel version", 
-					  LLVersionInfo::getChannel(), 
+					  LLVersionInfo::instance().getChannel(), 
 					  mResetChannel);
 
 		ensure_equals("Reset Version and channel String", 
-					  LLVersionInfo::getChannelAndVersion(), 
+					  LLVersionInfo::instance().getChannelAndVersion(), 
 					  mResetVersionAndChannel);
 	}
 }