diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-10-05 15:09:04 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-10-05 15:09:04 -0700 |
| commit | 6f9ed8b303e9e840fcd624b03ec0958dceba3dc7 (patch) | |
| tree | 4c6f00a5e0d0adb4327842b3326c23f040e42502 /indra/newview/llviewerwindow.cpp | |
| parent | 4716969716245ea832400dd087c93a514770cd63 (diff) | |
EXP-1273 Add floater for "Destinations" content
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 149f9893d7..30b6b0012d 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1939,6 +1939,13 @@ void LLViewerWindow::initWorldUI() gToolBarView->loadToolbars(); gToolBarView->setVisible(TRUE); } + + LLMediaCtrl* destinations = LLFloaterReg::getInstance("destinations")->getChild<LLMediaCtrl>("destination_guide_contents"); + if (destinations) + { + destinations->setErrorPageURL(gSavedSettings.getString("GenericErrorPageURL")); + destinations->navigateTo(gSavedSettings.getString("DestinationGuideURL"), "text/html"); + } } // Destroy the UI |