1 files changed, 56 insertions, 10 deletions

diff --git a/linden/indra/newview/llfloaterhtml.cpp b/linden/indra/newview/llfloaterhtml.cpp
index 0853514..2f7bc14 100644
--- a/linden/indra/newview/llfloaterhtml.cpp
+++ b/linden/indra/newview/llfloaterhtml.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -37,10 +37,13 @@
 #include "llvieweruictrlfactory.h"
 #include "llviewercontrol.h"
 #include "lllineeditor.h"
+#include "llviewerwindow.h"
+#include "llweb.h"
 
 #include "llwebbrowserctrl.h"
 
 LLFloaterHtml* LLFloaterHtml::sInstance = 0;
+LLViewerHtmlHelp gViewerHtmlHelp;
 
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -83,10 +86,6 @@ LLFloaterHtml::LLFloaterHtml()
         {
                 // open links in internal browser
                 mWebBrowser->setOpenInExternalBrowser( false );
-
-                // don't automatically open secondlife links since we want to catch
-                // special ones that do other stuff (like open F1 Help)
-                mWebBrowser->setOpenSLURLsInMap( false );
         }
 #endif // LL_LIBXUL_ENABLED
 }
@@ -122,7 +121,7 @@ void LLFloaterHtml::draw()
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-void LLFloaterHtml::show( LLString content_id )
+void LLFloaterHtml::show( LLString content_id, bool open_app_slurls )
 {
         // calculate the XML labels we'll need (if only XML folders worked)
         LLString title_str = content_id + "_title";
@@ -130,12 +129,12 @@ void LLFloaterHtml::show( LLString content_id )
 
         std::string title = childGetValue( title_str ).asString();
         std::string url = childGetValue( url_str ).asString();
-        show( url, title );
+        show( url, title, open_app_slurls );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-void LLFloaterHtml::show( std::string start_url, std::string title )
+void LLFloaterHtml::show( std::string start_url, std::string title, bool open_app_slurls )
 {
         // set the title 
         setTitle( title );
@@ -143,7 +142,10 @@ void LLFloaterHtml::show( std::string start_url, std::string title )
 #if LL_LIBXUL_ENABLED
         // navigate to the URL
         if ( mWebBrowser )
+        {
+                mWebBrowser->setOpenAppSLURLs( open_app_slurls );
                 mWebBrowser->navigateTo( start_url );
+        }
 #endif // LL_LIBXUL_ENABLED
 
         // make floater appear
@@ -200,7 +202,7 @@ void LLFloaterHtml::onClickHome( void* data )
                         else
                         {
                                 llwarns << "Invalid home page specified for HTML floater - navigating to default" << llendl;
-                                self->mWebBrowser->navigateTo( "http://google.com" );
+                                self->mWebBrowser->navigateTo( "http://secondlife.com" );
                         }
                 };
 #endif // LL_LIBXUL_ENABLED
@@ -259,3 +261,47 @@ void LLFloaterHtml::onClickGo( void* data )
                 };
         };
 }
+
+////////////////////////////////////////////////////////////////////////////////
+//
+static void onClickF1HelpLoadURL(S32 option, void* userdata)
+{
+        if (option == 0)
+        {
+                // choose HELP url based on selected language - default to english language support page
+                LLString lang = LLUI::sConfigGroup->getString("Language");
+
+                // *TODO:Translate
+                // this sucks but there isn't a way to grab an arbitrary string from an XML file
+                // (using llcontroldef strings causes problems if string don't exist)
+                LLString help_url( "http://secondlife.com/support" );
+                if ( lang == "ja" )
+                        help_url = "http://help.secondlife.com/jp";
+                else
+                if ( lang == "ko" )
+                        help_url = "http://help.secondlife.com/kr";
+                else
+                if ( lang == "pt" )
+                        help_url = "http://help.secondlife.com/pt";
+                else
+                if ( lang == "de" )
+                        help_url = "http://de.secondlife.com/support";
+
+                LLWeb::loadURL( help_url );
+        }
+}
+
+LLViewerHtmlHelp::LLViewerHtmlHelp()
+{
+        LLUI::setHtmlHelp(this);
+}
+
+LLViewerHtmlHelp::~LLViewerHtmlHelp()
+{
+        LLUI::setHtmlHelp(NULL);
+}
+
+void LLViewerHtmlHelp::show(std::string url, std::string title)
+{
+    gViewerWindow->alertXml("ClickOpenF1Help", onClickF1HelpLoadURL, (void*) NULL);
+}