diff options
| author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2026-05-18 18:53:37 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-18 18:53:37 +0300 |
| commit | a042022fa5c2f31013ec80d93baa5c749741373f (patch) | |
| tree | 0059199a8bc5fda6ec1e0d8c7b784c0a2b475f1c /indra | |
| parent | d3e12a53ff947febfaad598183ecb07df717774b (diff) | |
#5785 fix login and world UI overlap
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/lllogininstance.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llstartup.cpp | 4 |
2 files changed, 5 insertions, 0 deletions
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<std::string> uris; LLGridManager::getInstance()->getLoginURIs(uris); mLoginModule->connect(uris.front(), mRequestData); diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index fb55f2d206..f780e4f5bd 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1354,6 +1354,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)); |