diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2025-08-06 14:17:18 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-06 14:17:18 +0300 |
| commit | acc8928330fe1e5022a1e968afe7d7027b86a63a (patch) | |
| tree | b95453ecc772cb4eaf275aab6fb5a882087a4c33 /indra/newview/llviewerwindow.cpp | |
| parent | c25df5224f7bf150ddc56014b0389985da2eb542 (diff) | |
| parent | f338b91f7c9dbfe999b5ea9a1facb9eaeafb3407 (diff) | |
Merge release/2025.05 into develop
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); } } } |