Change out versioning code for less hacky versioning code

2016-01-16 10:06:07 -05:00
parent 2f2e1fbe8f
commit 13666ac62a
24 changed files with 451 additions and 326 deletions
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -90,7 +90,7 @@
 #include "lltexteditor.h"
 #include "llurlentry.h"
 #include "lluserrelations.h"
-#include "sgversion.h"
+#include "llversioninfo.h"
 #include "llviewercontrol.h"
 #include "llvfs.h"
 #include "llxorcipher.h"	// saved password, MAC address
@@ -693,9 +693,9 @@ bool idle_startup()
 			if(!start_messaging_system(
 				   message_template_path,
 				   port,
-				   gVersionMajor,
-				   gVersionMinor,
-				   gVersionPatch,
+				   LLVersionInfo::getMajor(),
+				   LLVersionInfo::getMinor(),
+				   LLVersionInfo::getPatch(),
 				   FALSE,
 				   std::string(),
 				   responder,