Second Life viewer sources 1.21.0-RC

1 files changed, 99 insertions, 26 deletions

diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index 8e55cf8..a90edb4 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -39,6 +39,9 @@
 #include "llui.h"       // for tr()
 #include "v3dmath.h"
 
+#include "llcurl.h"
+#include "llimagej2c.h"
+
 #include "llviewertexteditor.h"
 #include "llviewercontrol.h"
 #include "llagent.h"
@@ -47,6 +50,10 @@
 #include "llversionviewer.h"
 #include "llviewerbuild.h"
 #include "lluictrlfactory.h"
+#include "lluri.h"
+#include "llweb.h"
+#include "llsecondlifeurls.h"
+#include "lltrans.h"
 #include "llappviewer.h" 
 #include "llglheaders.h"
 #include "llmediamanager.h"
@@ -62,58 +69,94 @@ extern U32 gPacketsIn;
 
 LLFloaterAbout* LLFloaterAbout::sInstance = NULL;
 
+static std::string get_viewer_release_notes_url();
+
 ///----------------------------------------------------------------------------
 /// Class LLFloaterAbout
 ///----------------------------------------------------------------------------
 
 // Default constructor
 LLFloaterAbout::LLFloaterAbout() 
-:       LLFloater("floater_about", "FloaterAboutRect", "")
+:       LLFloater(std::string("floater_about"), std::string("FloaterAboutRect"), LLStringUtil::null)
 {
         LLUICtrlFactory::getInstance()->buildFloater(this, "floater_about.xml");
 
         // Support for changing product name.
-        LLString title("About ");
+        std::string title("About ");
         title += LLAppViewer::instance()->getSecondLifeTitle();
         setTitle(title);
 
-        LLString support;
+        LLViewerTextEditor *support_widget = 
+                getChild<LLViewerTextEditor>("support_editor", true);
+
+        LLViewerTextEditor *credits_widget = 
+                getChild<LLViewerTextEditor>("credits_editor", true);
+
+
+        if (!support_widget || !credits_widget)
+        {
+                return;
+        }
+
+        // For some reason, adding style doesn't work unless this is true.
+        support_widget->setParseHTML(TRUE);
+
+        // Text styles for release notes hyperlinks
+        LLStyleSP viewer_link_style(new LLStyle);
+        viewer_link_style->setVisible(true);
+        viewer_link_style->setFontName(LLStringUtil::null);
+        viewer_link_style->setLinkHREF(get_viewer_release_notes_url());
+        viewer_link_style->setColor(gSavedSettings.getColor4("HTMLLinkColor"));
 
         // Version string
-        LLString version = LLAppViewer::instance()->getSecondLifeTitle()
-                + llformat(" %d.%d.%d (%d) %s %s (%s)",
+        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());
-        support.append(version);
+        support_widget->appendColoredText(version, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor"));
+        support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), FALSE, FALSE, &viewer_link_style);
+
+        std::string support;
         support.append("\n\n");
 
         // Position
         LLViewerRegion* region = gAgent.getRegion();
         if (region)
         {
+                LLStyleSP server_link_style(new LLStyle);
+                server_link_style->setVisible(true);
+                server_link_style->setFontName(LLStringUtil::null);
+                server_link_style->setLinkHREF(region->getCapability("ServerReleaseNotes"));
+                server_link_style->setColor(gSavedSettings.getColor4("HTMLLinkColor"));
+
                 const LLVector3d &pos = gAgent.getPositionGlobal();
                 LLUIString pos_text = getUIString("you_are_at");
                 pos_text.setArg("[POSITION]",
                                                 llformat("%.1f, %.1f, %.1f ", pos.mdV[VX], pos.mdV[VY], pos.mdV[VZ]));
                 support.append(pos_text);
 
-                LLString region_text = llformat("in %s located at ",
-                                gAgent.getRegion()->getName().c_str());
+                std::string region_text = llformat("in %s located at ",
+                                                                                gAgent.getRegion()->getName().c_str());
                 support.append(region_text);
 
-                char buffer[MAX_STRING];                /*Flawfinder: ignore*/
-                gAgent.getRegion()->getHost().getHostName(buffer, MAX_STRING);
+                std::string buffer;
+                buffer = gAgent.getRegion()->getHost().getHostName();
                 support.append(buffer);
                 support.append(" (");
-                gAgent.getRegion()->getHost().getString(buffer, MAX_STRING);
+                buffer = gAgent.getRegion()->getHost().getString();
                 support.append(buffer);
                 support.append(")\n");
                 support.append(gLastVersionChannel);
-                support.append("\n\n");
+                support.append("\n");
+
+                support_widget->appendColoredText(support, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor"));
+                support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), FALSE, FALSE, &server_link_style);
+
+                support = "\n\n";
         }
 
-        //*NOTE: Do not translate text like GPU, Graphics Card, etc -
+        // *NOTE: Do not translate text like GPU, Graphics Card, etc -
         //  Most PC users that know what these mean will be used to the english versions,
         //  and this info sometimes gets sent to support
         
@@ -125,11 +168,11 @@ LLFloaterAbout::LLFloaterAbout()
         U32 memory = gSysMemory.getPhysicalMemoryKB() / 1024;
         // Moved hack adjustment to Windows memory size into llsys.cpp
 
-        LLString mem_text = llformat("Memory: %u MB\n", memory );
+        std::string mem_text = llformat("Memory: %u MB\n", memory );
         support.append(mem_text);
 
         support.append("OS Version: ");
-        support.append( LLAppViewer::instance()->getOSInfo().getOSString().c_str() );
+        support.append( LLAppViewer::instance()->getOSInfo().getOSString() );
         support.append("\n");
 
         support.append("Graphics Card Vendor: ");
@@ -144,6 +187,16 @@ LLFloaterAbout::LLFloaterAbout()
         support.append( (const char*) glGetString(GL_VERSION) );
         support.append("\n");
 
+        support.append("\n");
+
+        support.append("libcurl Version: ");
+        support.append( LLCurl::getVersionString() );
+        support.append("\n");
+
+        support.append("J2C Decoder Version: ");
+        support.append( LLImageJ2C::getEngineInfo() );
+        support.append("\n");
+
         LLMediaManager *mgr = LLMediaManager::getInstance();
         if (mgr)
         {
@@ -151,7 +204,7 @@ LLFloaterAbout::LLFloaterAbout()
                 if (media_source)
                 {
                         support.append("LLMozLib Version: ");
-                        support.append((const char*) media_source->getVersion().c_str());
+                        support.append(media_source->getVersion());
                         support.append("\n");
                         mgr->destroySource(media_source);
                 }
@@ -159,7 +212,7 @@ LLFloaterAbout::LLFloaterAbout()
 
         if (gPacketsIn > 0)
         {
-                LLString packet_loss = llformat("Packets Lost: %.0f/%.0f (%.1f%%)", 
+                std::string packet_loss = llformat("Packets Lost: %.0f/%.0f (%.1f%%)", 
                         LLViewerStats::getInstance()->mPacketsLostStat.getCurrent(),
                         F32(gPacketsIn),
                         100.f*LLViewerStats::getInstance()->mPacketsLostStat.getCurrent() / F32(gPacketsIn) );
@@ -167,17 +220,18 @@ LLFloaterAbout::LLFloaterAbout()
                 support.append("\n");
         }
 
+        support_widget->appendColoredText(support, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor"));
+
         // Fix views
-        childDisable("credits_editor");
+        support_widget->setCursorPos(0);
+        support_widget->setEnabled(FALSE);
+        support_widget->setTakesFocus(TRUE);
+        support_widget->setHandleEditKeysDirectly(TRUE);
 
-        LLTextEditor * support_widget = getChild<LLTextEditor>("support_editor", true);
-        if (support_widget)
-        {
-                support_widget->setEnabled( FALSE );
-                support_widget->setTakesFocus( TRUE );
-                support_widget->setText( support );
-                support_widget->setHandleEditKeysDirectly( TRUE );
-        }
+        credits_widget->setCursorPos(0);
+        credits_widget->setEnabled(FALSE);
+        credits_widget->setTakesFocus(TRUE);
+        credits_widget->setHandleEditKeysDirectly(TRUE);
 
         center();
 
@@ -200,3 +254,22 @@ void LLFloaterAbout::show(void*)
 
         sInstance->open();       /*Flawfinder: ignore*/
 }
+
+
+static std::string get_viewer_release_notes_url()
+{
+        std::ostringstream version;
+        version << LL_VERSION_MAJOR << "."
+                << LL_VERSION_MINOR << "."
+                << LL_VERSION_PATCH << "."
+                << LL_VERSION_BUILD;
+
+        LLSD query;
+        query["channel"] = gSavedSettings.getString("VersionChannelName");
+        query["version"] = version.str();
+
+        std::ostringstream url;
+        url << RELEASE_NOTES_BASE_URL << LLURI::mapToQueryString(query);
+
+        return url.str();
+}