summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2026-06-24 07:04:09 +0800
committerErik Kundiman <erik@megapahit.org>2026-06-24 07:04:09 +0800
commit2dbf2851fa81137b5553744f7e2b23b4f254cec9 (patch)
tree3c1ff273c3ffd81a455bed3cb6eccb338b62f676 /indra/newview/llstartup.cpp
parenta5f7a2ba98a40f225ae4fb53d5fcf4423eb21e48 (diff)
parent550ed6ded17531aff5cc922ec60763bb508dcc0c (diff)
Merge tag 'Second_Life_Release#550ed6de-26.3' into 26.3
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 198113cfb1..494a1b3378 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1381,6 +1381,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));