diff options
author | Oz Linden <oz@lindenlab.com> | 2010-10-12 08:47:26 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-10-12 08:47:26 -0400 |
commit | 3f43a36d3430e94046d40cb898a9fd34cce0f7d5 (patch) | |
tree | c3c483b3ce49ea5fcabe3041213223112edfba86 /indra/newview/llstartup.cpp | |
parent | 422780c88a98ad0b78c54a71189219de12992bc2 (diff) | |
parent | 011f6f9ad07d0a71c9a392f5e25af2aad69110ee (diff) |
merge fixes for VWR-23296
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r-- | indra/newview/llstartup.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 975d1f9f32..c56cacd12b 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -794,10 +794,6 @@ bool idle_startup() if (STATE_LOGIN_CLEANUP == LLStartUp::getStartupState()) { - // Move the progress view in front of the UI immediately when login is performed - // this allows not to see main menu after Alt+Tab was pressed while login. EXT-744. - gViewerWindow->moveProgressViewToFront(); - //reset the values that could have come in from a slurl // DEV-42215: Make sure they're not empty -- gUserCredential // might already have been set from gSavedSettings, and it's too bad @@ -1251,9 +1247,6 @@ bool idle_startup() if (!gNoRender) { - // Move the progress view in front of the UI - gViewerWindow->moveProgressViewToFront(); - // direct logging to the debug console's line buffer LLError::logToFixedBuffer(gDebugView->mDebugConsolep); |