From ad4a54db2d3e6be6e595d2c89899848679b8f748 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Tue, 16 Jun 2026 22:12:18 +0300 Subject: #5785 fix login and world UI overlap --- indra/newview/lllogininstance.cpp | 1 + indra/newview/llstartup.cpp | 4 ++++ 2 files changed, 5 insertions(+) (limited to 'indra') diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp index 0358233637..02f013ad3c 100644 --- a/indra/newview/lllogininstance.cpp +++ b/indra/newview/lllogininstance.cpp @@ -134,6 +134,7 @@ void LLLoginInstance::reconnect() { // Sort of like connect, only using the pre-existing // request params. + mAttemptComplete = false; std::vector uris; LLGridManager::getInstance()->getLoginURIs(uris); mLoginModule->connect(uris.front(), mRequestData); diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 55f23eb021..60c6a5c194 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1353,6 +1353,10 @@ bool idle_startup() { set_startup_status(0.30f, LLTrans::getString("LoginInitializingWorld"), gAgent.mMOTD); do_startup_frame(); + + // close login UI before world UI is initialized, if it is still visible + LLPanelLogin::closePanel(); + // We should have an agent id by this point. llassert(!(gAgentID == LLUUID::null)); -- cgit v1.3