Anonymous avatar Anonymous committed dc64834

CHOP-238 Fix to bug introduced by http://hg.secondlife.com/viewer-beta/changeset/4072bd5389b2 Reviewed by Brad

Comments (0)

Files changed (7)

indra/newview/llappviewer.cpp

 
 	// Save the current version to the prefs file
 	gSavedSettings.setString("LastRunVersion", 
-							 LLVersionInfo::getVersionAndChannel());
+							 LLVersionInfo::getChannelAndVersion());
 
 	gSimLastTime = gRenderStartTime.getElapsedTimeF32();
 	gSimFrames = (F32)gFrameCount;

indra/newview/lllogininstance.cpp

 	request_params["read_critical"] = false; // handleTOSResponse
 	request_params["last_exec_event"] = mLastExecEvent;
 	request_params["mac"] = hashed_unique_id_string;
-	request_params["version"] = LLVersionInfo::getVersionAndChannel(); // Includes channel name
+	request_params["version"] = LLVersionInfo::getChannelAndVersion(); // Includes channel name
 	request_params["channel"] = LLVersionInfo::getChannel();
 	request_params["id0"] = mSerialNumber;
 

indra/newview/llversioninfo.cpp

 }
 
 //static
-const std::string &LLVersionInfo::getVersionAndChannel()
+const std::string &LLVersionInfo::getChannelAndVersion()
 {
 	if (sVersionChannel.empty())
 	{
 		// cache the version string
 		std::ostringstream stream;
-		stream << LLVersionInfo::getVersion() 
+		stream << LLVersionInfo::getChannel()
 			   << " "
-			   << LLVersionInfo::getChannel();
+			   << LLVersionInfo::getVersion();
 		sVersionChannel = stream.str();
 	}
 

indra/newview/llversioninfo.h

 	static const std::string &getShortVersion();
 
 	/// return the viewer version and channel as a string
-	/// like "2.0.0.200030 Second Life Release"
-	static const std::string &getVersionAndChannel();
+	/// like "Second Life Release 2.0.0.200030"
+	static const std::string &getChannelAndVersion();
 
 	/// return the channel name, e.g. "Second Life"
 	static const std::string &getChannel();

indra/newview/llviewerstats.cpp

 
 	// send fps only for time app spends in foreground
 	agent["fps"] = (F32)gForegroundFrameCount / gForegroundTime.getElapsedTimeF32();
-	agent["version"] = LLVersionInfo::getVersionAndChannel();
+	agent["version"] = LLVersionInfo::getChannelAndVersion();
 	std::string language = LLUI::getLanguage();
 	agent["language"] = language;
 	

indra/newview/tests/lllogininstance_test.cpp

 
 //-----------------------------------------------------------------------------
 #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; }
 
 //-----------------------------------------------------------------------------

indra/newview/tests/llversioninfo_test.cpp

 			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;
 					  LLVersionInfo::getShortVersion(), 
 					  mShortVersion);
 		ensure_equals("Version and channel String", 
-					  LLVersionInfo::getVersionAndChannel(), 
+					  LLVersionInfo::getChannelAndVersion(), 
 					  mVersionAndChannel);
 
 		LLVersionInfo::resetChannel(mResetChannel);
 					  mResetChannel);
 
 		ensure_equals("Reset Version and channel String", 
-					  LLVersionInfo::getVersionAndChannel(), 
+					  LLVersionInfo::getChannelAndVersion(), 
 					  mResetVersionAndChannel);
 	}
 }
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.