diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-10-05 15:28:15 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-10-05 15:28:15 -0700 |
| commit | a88bb3231b2685eb640710d7617d26b7f3a2c0d2 (patch) | |
| tree | bbc72781e8ba197b5c7598e9b85220f7ee848cc3 /indra/newview/llviewerwindow.cpp | |
| parent | d41f496510a2bc489efb9ae4479a70646eb989b8 (diff) | |
| parent | 11a0d0cd59c86cee18b6b2fd92fcbac62502ede0 (diff) | |
EXP-1202 : pull from richard/viewer-experience-fui
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 a673555e31..a28950f376 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1938,6 +1938,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 |