diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-05-20 07:37:00 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-05-20 07:37:00 +0800 |
| commit | 31f6b6064a4e8d14b55787b7bc9da71d6659793c (patch) | |
| tree | ae51107485d65fa4a838738fb262cf7ef7a0279b | |
| parent | b6a7476bab2822a5e09acd9e2734e71dc1334143 (diff) | |
| parent | 115686ca0f962da9ec5dbcdbe54a4cb6c86302bb (diff) | |
Merge remote-tracking branch 'secondlife/release/2026.02' into 2026.02
| -rw-r--r-- | indra/newview/llpanellogin.cpp | 13 | ||||
| -rw-r--r-- | indra/newview/lltoastnotifypanel.cpp | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 7457f1c301..15cc8b421c 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -913,10 +913,17 @@ void LLPanelLogin::loadLoginPage() gViewerWindow->setMenuBackgroundColor(false, !LLGridManager::getInstance()->isInProductionGrid()); - if (sInstance->mWebBrowser->getCurrentNavUrl() != login_uri.asString()) + if (sInstance->mWebBrowser) { - LL_DEBUGS("AppInit") << "loading: " << login_uri << LL_ENDL; - sInstance->mWebBrowser->navigateTo(login_uri.asString(), "text/html"); + if (sInstance->mWebBrowser->getCurrentNavUrl() != login_uri.asString()) + { + LL_DEBUGS("AppInit") << "loading: " << login_uri << LL_ENDL; + sInstance->mWebBrowser->navigateTo(login_uri.asString(), "text/html"); + } + } + else + { + LL_WARNS("AppInit") << "No web browser control for login panel" << LL_ENDL; } } diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp index 8a7095f8ca..0c4a9c81c2 100644 --- a/indra/newview/lltoastnotifypanel.cpp +++ b/indra/newview/lltoastnotifypanel.cpp @@ -380,8 +380,6 @@ void LLToastNotifyPanel::init( LLRect rect, bool show_images ) button_panel_width = min_width_required; S32 width_increase = button_panel_width - mControlPanel->getRect().getWidth(); reshape(getRect().getWidth() + width_increase, getRect().getHeight()); - mInfoPanel->reshape(mInfoPanel->getRect().getWidth() + width_increase, mInfoPanel->getRect().getHeight()); - mTextBox->reshape(mTextBox->getRect().getWidth() + width_increase, mTextBox->getRect().getHeight()); } } //try get an average h_pad to spread out buttons |