Added test version info to llversionviewer.h

5 files changed, 29 insertions, 7 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 45cf029..eba375b 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -34,6 +34,18 @@
         Patch by Aleric Inglewood.
 
 
+2008-12-06  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * linden/indra/llcommon/llversionviewer.h:
+        Added test version info.
+        * linden/indra/newview/llfloaterabout.cpp:
+        Ditto.
+        * linden/indra/newview/llappviewer.cpp:
+        Ditto.
+        * linden/indra/newview/llpanellogin.cpp:
+        Ditto.
+
+
 2008-12-05  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * linden/indra/llcommon/llsecondlifeurls.cpp:
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index bc42359..cddc654 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -45,5 +45,6 @@ const char * const IMP_VIEWER_NAME = "Imprudence";
 const S32 IMP_VERSION_MAJOR = 1;
 const S32 IMP_VERSION_MINOR = 0;
 const S32 IMP_VERSION_PATCH = 0;
+const char * const IMP_VERSION_TEST = "RC2";
 
 #endif
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 243a9d8..14214b5 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -602,11 +602,12 @@ bool LLAppViewer::init()
     writeSystemInfo();
 
         // Build a string representing the current version number.
-    gCurrentVersion = llformat("%s %d.%d.%d / %s %d.%d.%d.%d", 
+    gCurrentVersion = llformat("%s %d.%d.%d %s / %s %d.%d.%d.%d", 
         gSavedSettings.getString("VersionChannelName").c_str(), 
         IMP_VERSION_MAJOR, 
         IMP_VERSION_MINOR, 
-        IMP_VERSION_PATCH, 
+        IMP_VERSION_PATCH,
+                IMP_VERSION_TEST,
         LL_VIEWER_NAME,
         LL_VERSION_MAJOR, 
         LL_VERSION_MINOR, 
@@ -2247,6 +2248,7 @@ void LLAppViewer::writeSystemInfo()
         gDebugInfo["ClientInfo"]["ImpMajorVersion"] = IMP_VERSION_MAJOR;
         gDebugInfo["ClientInfo"]["ImpMinorVersion"] = IMP_VERSION_MINOR;
         gDebugInfo["ClientInfo"]["ImpPatchVersion"] = IMP_VERSION_PATCH;
+        gDebugInfo["ClientInfo"]["ImpTestVersion"] = IMP_VERSION_TEST;
         gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR;
         gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR;
         gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH;
@@ -2330,6 +2332,7 @@ void LLAppViewer::handleViewerCrash()
         gDebugInfo["ClientInfo"]["ImpMajorVersion"] = IMP_VERSION_MAJOR;
         gDebugInfo["ClientInfo"]["ImpMinorVersion"] = IMP_VERSION_MINOR;
         gDebugInfo["ClientInfo"]["ImpPatchVersion"] = IMP_VERSION_PATCH;
+        gDebugInfo["ClientInfo"]["ImpTestVersion"] = IMP_VERSION_TEST;
         gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR;
         gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR;
         gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH;
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index cb4d405..59e3100 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -110,9 +110,9 @@ LLFloaterAbout::LLFloaterAbout()
 
         // Version string
         std::string version = llformat(
-          "%s %d.%d.%d / %s %d.%d.%d (%d), %s %s\n",
+          "%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_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,
           __DATE__, __TIME__);
@@ -266,8 +266,13 @@ static std::string get_viewer_release_notes_url()
                 << IMP_VERSION_MINOR << "."
                 << IMP_VERSION_PATCH;
 
+        std::ostringstream test_version;
+
+        if(IMP_VERSION_TEST != "")
+                test_version << "#" << "Imprudence_" << version.str() << "_" << IMP_VERSION_TEST;
+
         std::ostringstream url;
-        url << RELEASE_NOTES_BASE_URL << version.str();
+        url << RELEASE_NOTES_BASE_URL << version.str() << test_version.str();
 
         return url.str();
 }
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 09e2cee..40a3a7f 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -360,10 +360,11 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
         // childSetAction("quit_btn", onClickQuit, this);
 
         std::string imp_channel = gSavedSettings.getString("VersionChannelName");
-        std::string imp_version = llformat("%d.%d.%d",
+        std::string imp_version = llformat("%d.%d.%d %s",
                 IMP_VERSION_MAJOR,
                 IMP_VERSION_MINOR,
-                IMP_VERSION_PATCH );
+                IMP_VERSION_PATCH,
+                IMP_VERSION_TEST );
 
         std::string ll_channel = LL_VIEWER_NAME;
         std::string ll_version = llformat("%d.%d.%d (%d)",