diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-10-06 20:01:40 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-10-06 20:01:40 -0700 |
| commit | 8919ef0ea442ae13076705d881b5e67cf8bed606 (patch) | |
| tree | e03fc77ea2b93565d01ebb494ec85f6624389650 /indra/newview/llviewerwindow.cpp | |
| parent | ea02a6a80d52a030db71100856826eaff43ccce8 (diff) | |
| parent | 1bd5fd7edc9019f4ab4dfd1c4d25967f23d14401 (diff) | |
Pull from richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index a28950f376..fae3ee9081 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1945,6 +1945,12 @@ void LLViewerWindow::initWorldUI() destinations->setErrorPageURL(gSavedSettings.getString("GenericErrorPageURL")); destinations->navigateTo(gSavedSettings.getString("DestinationGuideURL"), "text/html"); } + LLMediaCtrl* avatar_picker = LLFloaterReg::getInstance("avatar")->findChild<LLMediaCtrl>("avatar_picker_contents"); + if (avatar_picker) + { + avatar_picker->setErrorPageURL(gSavedSettings.getString("GenericErrorPageURL")); + avatar_picker->navigateTo(gSavedSettings.getString("AvatarPickerURL"), "text/html"); + } } // Destroy the UI |