diff options
| author | Richard Linden <none@none> | 2011-03-23 19:34:15 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-03-23 19:34:15 -0700 |
| commit | fdf63ba0753fcfc17aa6939836c7835787293b3c (patch) | |
| tree | cd2bbbad8c1bd8b901a755b81f9cbb78f0bdee43 /indra/newview/llviewerwindow.cpp | |
| parent | 501e282ee03e6d53c16c421d8b49f8bed3e74ef3 (diff) | |
| parent | 9c82ea334ab0c1283f28997fe060b24200e3e2be (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index aa83bcb68b..014d64176a 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1791,19 +1791,18 @@ void LLViewerWindow::initWorldUI() LLMediaCtrl* avatar_picker = avatar_picker_destination_guide_container->findChild<LLMediaCtrl>("avatar_picker_contents"); if (destinations) { + destinations->setErrorPageURL(gSavedSettings.getString("GenericErrorPageURL")); destinations->navigateTo(gSavedSettings.getString("DestinationGuideURL"), "text/html"); } if (avatar_picker) { + avatar_picker->setErrorPageURL(gSavedSettings.getString("GenericErrorPageURL")); avatar_picker->navigateTo(gSavedSettings.getString("AvatarPickerURL"), "text/html"); } - if (gSavedSettings.getBOOL("FirstLoginThisInstall")) - { - toggle_destination_and_avatar_picker(0); - gSavedSettings.setBOOL("FirstLoginThisInstall", FALSE); - } + // show destinations by default + toggle_destination_and_avatar_picker(gSavedSettings.getS32("DestinationsAndAvatarsVisibility")); } // Destroy the UI |