diff options
| author | Richard Linden <none@none> | 2010-10-22 18:37:40 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-10-22 18:37:40 -0700 |
| commit | 20e9dbf40b0c3e4ef9674adbaca255723a412959 (patch) | |
| tree | 9874bd519d6c0863289df70a6a57a4909cd95276 /indra/newview/llviewerwindow.cpp | |
| parent | 50e77faaf784d970d80d6463e7e2dbcf73d194d8 (diff) | |
EXP-273 FIXED Add button/tray for avatar picker
made "toggleable" radio group
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 62e8f4223e..774cf05220 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1699,12 +1699,19 @@ void LLViewerWindow::initWorldUI() buttons_panel->setFollowsAll(); buttons_panel_container->addChild(buttons_panel); - LLView* destination_guide = gViewerWindow->getRootView()->getChild<LLView>("destination_guide_container"); - LLMediaCtrl* destinations = destination_guide->findChild<LLMediaCtrl>("destination_guide_contents"); + LLView* avatar_picker_destination_guide_container = gViewerWindow->getRootView()->getChild<LLView>("avatar_picker_and_destination_guide_container"); + LLMediaCtrl* destinations = avatar_picker_destination_guide_container->findChild<LLMediaCtrl>("destination_guide_contents"); + LLMediaCtrl* avatar_picker = avatar_picker_destination_guide_container->findChild<LLMediaCtrl>("avatar_picker_contents"); if (destinations) { - destinations->navigateTo(gSavedSettings.getString("DestinationGuideURL")); + destinations->navigateTo(gSavedSettings.getString("DestinationGuideURL"), "text/html"); } + + if (avatar_picker) + { + avatar_picker->navigateTo(gSavedSettings.getString("AvatarPickerURL"), "text/html"); + } + } // Destroy the UI |