1 files changed, 15 insertions, 13 deletions

diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index 76586ed..af436c5 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -109,11 +109,14 @@ LLFloaterAbout::LLFloaterAbout()
         viewer_link_style->setColor(gSavedSettings.getColor4("HTMLLinkColor"));
 
         // Version string
-        std::string version = LLAppViewer::instance()->getSecondLifeTitle()
-                + llformat(" %d.%d.%d (%d) %s %s (%s)\n",
-                                   LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD,
-                                   __DATE__, __TIME__,
-                                   gSavedSettings.getString("VersionChannelName").c_str());
+        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,
+          __DATE__, __TIME__);
+
         support_widget->appendColoredText(version, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor"));
         support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), FALSE, FALSE, &viewer_link_style);
 
@@ -259,17 +262,16 @@ void LLFloaterAbout::show(void*)
 static std::string get_viewer_release_notes_url()
 {
         std::ostringstream version;
-        version << LL_VERSION_MAJOR << "."
-                << LL_VERSION_MINOR << "."
-                << LL_VERSION_PATCH << "."
-                << LL_VERSION_BUILD;
+        version << IMP_VERSION_MAJOR << "."
+                << IMP_VERSION_MINOR << "."
+                << IMP_VERSION_PATCH;
 
-        LLSD query;
-        query["channel"] = gSavedSettings.getString("VersionChannelName");
-        query["version"] = version.str();
+        // Append the test version if it's not empty
+        if( strcmp(IMP_VERSION_TEST, "") != 0 )
+                version << "-" << IMP_VERSION_TEST;
 
         std::ostringstream url;
-        url << RELEASE_NOTES_BASE_URL << LLURI::mapToQueryString(query);
+        url << RELEASE_NOTES_BASE_URL << version.str();
 
         return url.str();
 }