summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
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));