1 files changed, 24 insertions, 13 deletions

diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index 19b7653..37e9c54 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -110,11 +110,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);
 
@@ -201,11 +204,20 @@ LLFloaterAbout::LLFloaterAbout()
         support.append("Audio Driver Version: ");
         bool want_fullname = true;
         support.append( gAudiop ? gAudiop->getDriverName(want_fullname) : "(none)" );
+
         support.append("\n");
 
         LLMediaManager *mgr = LLMediaManager::getInstance();
         if (mgr)
         {
+                LLMediaBase *gstreamer = mgr->createSourceFromMimeType("http", "audio/mpeg");
+                if (gstreamer)
+                {
+                        support.append("GStreamer Version: ");
+                        support.append( gstreamer->getVersion() );
+                        support.append("\n");
+                } 
+
                 LLMediaBase *media_source = mgr->createSourceFromMimeType("http", "text/html");
                 if (media_source)
                 {
@@ -265,17 +277,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();
 }