fix bring help-f1 page under control of hippogridmanager

4 files changed, 38 insertions, 22 deletions

diff --git a/linden/indra/newview/llfloaterhtmlhelp.cpp b/linden/indra/newview/llfloaterhtmlhelp.cpp
index 2a22a40..ff69394 100644
--- a/linden/indra/newview/llfloaterhtmlhelp.cpp
+++ b/linden/indra/newview/llfloaterhtmlhelp.cpp
@@ -54,6 +54,7 @@
 #include "llviewerparcelmedia.h"
 #include "llcombobox.h"
 
+#include "hippoGridManager.h"
 
 LLFloaterMediaBrowser::LLFloaterMediaBrowser(const LLSD& media_data)
 {
@@ -454,22 +455,18 @@ void LLFloaterHtmlHelp::show(std::string url, std::string title)
         LLFloaterHtml* floater_html = LLFloaterHtml::getInstance();
         floater_html->setVisible(FALSE);
         
-        if (url.empty())
-        {
-                url = floater_html->getSupportUrl();
-        }
-
-        if (gSavedSettings.getBOOL("UseExternalBrowser"))
-        {
-        LLSD payload;
-        payload["url"] = url;
-                
-            LLNotifications::instance().add("ClickOpenF1Help", LLSD(), payload, onClickF1HelpLoadURL);      
-        }
-        else
-        {
-            // don't wait, just do it
-        LLWeb::loadURL(url);
+        url = gHippoGridManager->getConnectedGrid()->getSupportUrl();
+        if (!url.empty()) {
+                if (gSavedSettings.getBOOL("UseExternalBrowser")) {
+                        LLSD payload;
+                        payload["url"] = url;
+                        LLNotifications::instance().add("ClickOpenF1Help", LLSD(), payload, onClickF1HelpLoadURL);
+                } else {
+                        // don't wait, just do it
+                        LLWeb::loadURL(url);
+                }
+        } else {
+                LLNotifications::instance().add("NoSupportUrl");
         }
 }
 
@@ -479,7 +476,12 @@ bool LLFloaterHtmlHelp::onClickF1HelpLoadURL(const LLSD& notification, const LLS
         S32 option = LLNotification::getSelectedOption(notification, response);
         if (option == 0)
         {
-                LLWeb::loadURL(notification["payload"]["url"].asString());
+                const std::string &url = notification["payload"]["url"].asString();
+                if (!url.empty()) {
+                        LLWeb::loadURL(url);
+                } else {
+                        llwarns << "Support URL not available." << llendl;
+                }
         }
         return false;
 }
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index e7271b8..ef25fb8 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -2914,7 +2914,12 @@ bool first_run_dialog_callback(const LLSD& notification, const LLSD& response)
         if (0 == option)
         {
                 LL_DEBUGS("AppInit") << "First run dialog cancelling" << LL_ENDL;
-                LLWeb::loadURL( CREATE_ACCOUNT_URL );
+                const std::string &url = gHippoGridManager->getConnectedGrid()->getRegisterUrl();
+                if (!url.empty()) {
+                        LLWeb::loadURL(url);
+                } else {
+                        llwarns << "Account creation URL is empty" << llendl;
+                }
         }
 
         LLPanelLogin::giveFocus();
@@ -2939,9 +2944,11 @@ bool login_alert_status(const LLSD& notification, const LLSD& response)
     {
         case 0:     // OK
             break;
-        case 1:     // Help
-            LLWeb::loadURL( SUPPORT_URL );
+        case 1: {   // Help
+            const std::string &url = gHippoGridManager->getConnectedGrid()->getSupportUrl();
+            if (!url.empty()) LLWeb::loadURL(url);
             break;
+        }
         case 2:     // Teleport
             // Restart the login process, starting at our home locaton
             LLURLSimString::setString(LLURLSimString::sLocationStringHome);
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 2e72a2a..41c3578 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -5865,7 +5865,7 @@ class LLShowFloater : public view_listener_t
                 }
                 else if (floater_name == "help f1")
                 {
-                        LLFloaterMediaBrowser::helpF1();
+                        gViewerHtmlHelp.show();
                 }
                 else if (floater_name == "help tutorial")
                 {
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index efc45d0..b0deeef 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -4130,7 +4130,7 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
    icon="alertmodal.tga"
    name="ClickOpenF1Help"
    type="alertmodal">
-    Visit the [SECOND_LIFE] Support Website? (note: this is not an Imprudence Help site)
+Visit the [GRID] Support Web site?
     <usetemplate
      ignoretext="When visiting the Support Website."
      name="okcancelignore"
@@ -4140,6 +4140,13 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
 
   <notification
    icon="alertmodal.tga"
+   name="NoSupportUrl"
+   type="alertmodal">
+[GRID] has no link for support.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
    name="ConfirmQuit"
    type="alertmodal">
     Are you sure you want to quit?