summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorJonathan "Geenz" Goodman <geenz@geenzo.com>2026-06-30 17:15:12 -0400
committerJonathan "Geenz" Goodman <geenz@geenzo.com>2026-06-30 17:15:12 -0400
commitcd62a49879374c84b66e1ee963e161c3e6109977 (patch)
tree8b023e916f13cd76daa6479ad62e4aac6734a9ff /indra/newview/llstartup.cpp
parentc299c8038e73e541cafe3c8df135752cb48b903c (diff)
parentc99cd251383ed17b4dd1210ee0701d2a3b4dd0e5 (diff)
Merge branch 'release/26.3' into geenz/texture-streaming-tweaks
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp4
1 files changed, 4 insertions, 0 deletions
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));