diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-07-25 18:14:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-25 18:14:28 -0400 |
| commit | 0c39bdfd4de14a02104f3748030e974fbc98d978 (patch) | |
| tree | 4b97c902f513c06a23ddd9e954a4d01e8c604019 /indra/newview/llviewerwindow.cpp | |
| parent | 210f559efe81864c7581677882c867dc14b7f854 (diff) | |
| parent | af507ce246249f5f80172538fc6780615b00a633 (diff) | |
Merge pull request #4442 from secondlife/geenz/main-to-2025.05
Geenz/main to 2025.05
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index f14ca62c83..6aade15d23 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -2291,13 +2291,13 @@ void LLViewerWindow::initWorldUI() url = LLWeb::expandURLSubstitutions(url, LLSD()); destinations->navigateTo(url, HTTP_CONTENT_TEXT_HTML); } - LLMediaCtrl* avatar_picker = LLFloaterReg::getInstance("avatar")->findChild<LLMediaCtrl>("avatar_picker_contents"); - if (avatar_picker) + LLMediaCtrl* avatar_welcome_pack = LLFloaterReg::getInstance("avatar_welcome_pack")->findChild<LLMediaCtrl>("avatar_picker_contents"); + if (avatar_welcome_pack) { - avatar_picker->setErrorPageURL(gSavedSettings.getString("GenericErrorPageURL")); - std::string url = gSavedSettings.getString("AvatarPickerURL"); + avatar_welcome_pack->setErrorPageURL(gSavedSettings.getString("GenericErrorPageURL")); + std::string url = gSavedSettings.getString("AvatarWelcomePack"); url = LLWeb::expandURLSubstitutions(url, LLSD()); - avatar_picker->navigateTo(url, HTTP_CONTENT_TEXT_HTML); + avatar_welcome_pack->navigateTo(url, HTTP_CONTENT_TEXT_HTML); } } } |