From 90be7378983c47e13b878eb6a42b99e7c354d68a Mon Sep 17 00:00:00 2001
From: "Mark Palange (Mani)" <palange@lindenlab.com>
Date: Fri, 5 Feb 2010 13:19:42 -0800
Subject: [PATCH] EXT-4232 Keeping gSpashScreen up until the viewer window
appears. Move the call to LLSpashScreen::hide() to the point where we show
the main window. Reviewed by Richard
---
indra/newview/llappviewer.cpp | 3 ---
indra/newview/llstartup.cpp | 3 +++
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 2d694eefd35..f2b3c7826c9 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2365,9 +2365,6 @@ bool LLAppViewer::initWindow()
// store setting in a global for easy access and modification
gNoRender = gSavedSettings.getBOOL("DisableRendering");
- // Hide the splash screen
- LLSplashScreen::hide();
-
// always start windowed
BOOL ignorePixelDepth = gSavedSettings.getBOOL("IgnorePixelDepth");
gViewerWindow = new LLViewerWindow(gWindowTitle,
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 37c8d94d5e4..7f002db3644 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -800,6 +800,9 @@ bool idle_startup()
gLoginMenuBarView->setVisible( TRUE );
gLoginMenuBarView->setEnabled( TRUE );
+ // Hide the splash screen
+ LLSplashScreen::hide();
+
// Push our window frontmost
gViewerWindow->getWindow()->show();
display_startup();
--
GitLab