merge

2 files changed, 7 insertions, 7 deletions

diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp
index b902c7ab09..309e9e9ee3 100644
--- a/indra/newview/tests/lllogininstance_test.cpp
+++ b/indra/newview/tests/lllogininstance_test.cpp
@@ -181,7 +181,7 @@ void LLUIColorTable::saveUserSettings(void)const {}
 
 //-----------------------------------------------------------------------------
 #include "../llversioninfo.h"
-const std::string &LLVersionInfo::getVersionAndChannel() { return VIEWERLOGIN_VERSION_CHANNEL; }
+const std::string &LLVersionInfo::getChannelAndVersion() { return VIEWERLOGIN_VERSION_CHANNEL; }
 const std::string &LLVersionInfo::getChannel() { return VIEWERLOGIN_CHANNEL; }
 
 //-----------------------------------------------------------------------------
diff --git a/indra/newview/tests/llversioninfo_test.cpp b/indra/newview/tests/llversioninfo_test.cpp
index 8855a24ead..398d8f16ed 100644
--- a/indra/newview/tests/llversioninfo_test.cpp
+++ b/indra/newview/tests/llversioninfo_test.cpp
@@ -51,15 +51,15 @@ namespace tut
 			mShortVersion = stream.str();
 			stream.str("");
 
-			stream << mVersion
+			stream << LL_CHANNEL
 				   << " "
-				   << LL_CHANNEL;
+				   << mVersion;
 			mVersionAndChannel = stream.str();
 			stream.str("");
 
-			stream << mVersion
+			stream << mResetChannel
 				   << " "
-				   << mResetChannel;
+				   << mVersion;
 			mResetVersionAndChannel = stream.str();
 		}
 		std::string mResetChannel;
@@ -99,7 +99,7 @@ namespace tut
 					  LLVersionInfo::getShortVersion(), 
 					  mShortVersion);
 		ensure_equals("Version and channel String", 
-					  LLVersionInfo::getVersionAndChannel(), 
+					  LLVersionInfo::getChannelAndVersion(), 
 					  mVersionAndChannel);
 
 		LLVersionInfo::resetChannel(mResetChannel);
@@ -108,7 +108,7 @@ namespace tut
 					  mResetChannel);
 
 		ensure_equals("Reset Version and channel String", 
-					  LLVersionInfo::getVersionAndChannel(), 
+					  LLVersionInfo::getChannelAndVersion(), 
 					  mResetVersionAndChannel);
 	}
 }