From b33c37c28d94e45e67c9176e420d6e386970f6dd Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 14 May 2010 13:51:33 -0700
Subject: Set the imprudence viewer version in xml

---
 linden/indra/newview/llfloaterabout.cpp | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'linden/indra/newview/llfloaterabout.cpp')

diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index 772428e..7e6c43f 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -50,8 +50,6 @@
 #include "llagent.h"
 #include "llviewerstats.h"
 #include "llviewerregion.h"
-#include "llversionviewer.h"
-#include "llviewerbuild.h"
 #include "lluictrlfactory.h"
 #include "lluri.h"
 #include "llweb.h"
@@ -61,6 +59,7 @@
 #include "llglheaders.h"
 #include "llmediamanager.h"
 #include "llwindow.h"
+#include "viewerversion.h"
 
 #if LL_WINDOWS
 #include "lldxhardware.h"
@@ -118,10 +117,10 @@ LLFloaterAbout::LLFloaterAbout()
 	// Version string
 	std::string version = llformat(
 	  "%s %d.%d.%d %s / %s %d.%d.%d (%d), %s %s\n",
-		IMP_VIEWER_NAME,
-	  IMP_VERSION_MAJOR, IMP_VERSION_MINOR, IMP_VERSION_PATCH, IMP_VERSION_TEST,
-		LL_VIEWER_NAME,
-	  LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD,
+	  ViewerVersion::getImpViewerName().c_str(),
+	  ViewerVersion::getImpMajorVersion(), ViewerVersion::getImpMinorVersion(), ViewerVersion::getImpPatchVersion(), ViewerVersion::getImpTestVersion().c_str(),
+	  ViewerVersion::getLLViewerName().c_str(),
+	  ViewerVersion::getLLMajorVersion(), ViewerVersion::getLLMinorVersion(), ViewerVersion::getLLPatchVersion(), ViewerVersion::getLLBuildVersion(),
 	  __DATE__, __TIME__);
 
 	support_widget->appendColoredText(version, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor"));
@@ -315,13 +314,13 @@ void LLFloaterAbout::show(void*)
 static std::string get_viewer_release_notes_url()
 {
 	std::ostringstream version;
-	version << IMP_VERSION_MAJOR << "."
-	        << IMP_VERSION_MINOR << "."
-	        << IMP_VERSION_PATCH;
+	version << ViewerVersion::getImpMajorVersion() << "."
+	        << ViewerVersion::getImpMinorVersion() << "."
+	        << ViewerVersion::getImpPatchVersion();
 
 	// Append the test version if it's not empty
-	if( strcmp(IMP_VERSION_TEST, "") != 0 )
-		version << "-" << IMP_VERSION_TEST;
+	if( !(ViewerVersion::getImpTestVersion().empty()) )
+		version << "-" << ViewerVersion::getImpTestVersion();
 
 	std::ostringstream url;
 	url << RELEASE_NOTES_BASE_URL << version.str();
-- 
cgit v1.1