diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-02-05 13:19:42 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-02-05 13:19:42 -0800 |
| commit | 90be7378983c47e13b878eb6a42b99e7c354d68a (patch) | |
| tree | 462f6ced2dc89ea90315ab9cde70f97c091fb68c /indra/newview | |
| parent | 41ab7853536dcbbf2b64d06b754617ee6bc7e896 (diff) | |
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
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 3 | ||||
| -rw-r--r-- | 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 2d694eefd3..f2b3c7826c 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 37c8d94d5e..7f002db364 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(); |