diff options
| author | AtlasLinden <114031241+AtlasLinden@users.noreply.github.com> | 2025-08-06 09:42:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-06 09:42:26 -0400 |
| commit | e4a25dc5b97cd939e6a5ddc8275a728075768a52 (patch) | |
| tree | ef39a05be37eae43e34d5c1e5ab081aa208b0ebd /indra/newview/llviewerwindow.cpp | |
| parent | 9311b522d8979cfe6e7a751f9447df8e0c3d1e96 (diff) | |
| parent | 819817f5c9cebad353f5b86996b5426095dd73b8 (diff) | |
Merge branch 'develop' into atlas-qaworkflow
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); } } } |