aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterhtmlhelp.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llfloaterhtmlhelp.cpp')
-rw-r--r--linden/indra/newview/llfloaterhtmlhelp.cpp27
1 files changed, 18 insertions, 9 deletions
diff --git a/linden/indra/newview/llfloaterhtmlhelp.cpp b/linden/indra/newview/llfloaterhtmlhelp.cpp
index 5caf7b1..1777403 100644
--- a/linden/indra/newview/llfloaterhtmlhelp.cpp
+++ b/linden/indra/newview/llfloaterhtmlhelp.cpp
@@ -438,16 +438,22 @@ void LLFloaterHtmlHelp::show(std::string url, std::string title)
438 floater_html->setVisible(FALSE); 438 floater_html->setVisible(FALSE);
439 439
440 url = gHippoGridManager->getConnectedGrid()->getSupportUrl(); 440 url = gHippoGridManager->getConnectedGrid()->getSupportUrl();
441 if (!url.empty()) { 441 if (!url.empty())
442 if (gSavedSettings.getBOOL("UseExternalBrowser")) { 442 {
443 if (gSavedSettings.getBOOL("UseExternalBrowser"))
444 {
443 LLSD payload; 445 LLSD payload;
444 payload["url"] = url; 446 payload["url"] = url;
445 LLNotifications::instance().add("ClickOpenF1Help", LLSD(), payload, onClickF1HelpLoadURL); 447 LLNotifications::instance().add("ClickOpenF1Help", LLSD(), payload, onClickF1HelpLoadURL);
446 } else { 448 }
449 else
450 {
447 // don't wait, just do it 451 // don't wait, just do it
448 LLWeb::loadURL(url); 452 LLWeb::loadURLInternal(url);
449 } 453 }
450 } else { 454 }
455 else
456 {
451 LLNotifications::instance().add("NoSupportUrl"); 457 LLNotifications::instance().add("NoSupportUrl");
452 } 458 }
453} 459}
@@ -458,10 +464,13 @@ bool LLFloaterHtmlHelp::onClickF1HelpLoadURL(const LLSD& notification, const LLS
458 S32 option = LLNotification::getSelectedOption(notification, response); 464 S32 option = LLNotification::getSelectedOption(notification, response);
459 if (option == 0) 465 if (option == 0)
460 { 466 {
461 const std::string &url = notification["payload"]["url"].asString(); 467 const std::string& url = notification["payload"]["url"].asString();
462 if (!url.empty()) { 468 if (!url.empty())
463 LLWeb::loadURL(url); 469 {
464 } else { 470 LLWeb::loadURLExternal(url);
471 }
472 else
473 {
465 llwarns << "Support URL not available." << llendl; 474 llwarns << "Support URL not available." << llendl;
466 } 475 }
467 } 476 }