From 245677e941d47963b67d36deffd03535dfc3df3f Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Thu, 24 Sep 2015 11:19:20 -0700 Subject: MAINT-5614: There are an obscene number of calls to "display_startup()" in the show login state. Try removing some of them. --- indra/newview/llstartup.cpp | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index b0ea00e6e4..ff8b79bc7c 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -728,12 +728,12 @@ bool idle_startup() if (gLoginMenuBarView == NULL) { LL_DEBUGS("AppInit") << "initializing menu bar" << LL_ENDL; - display_startup(); +// display_startup(); initialize_edit_menu(); initialize_spellcheck_menu(); - display_startup(); +// display_startup(); init_menus(); - display_startup(); +// display_startup(); } if (show_connect_box) @@ -745,23 +745,23 @@ bool idle_startup() if (gUserCredential.isNull()) { LL_DEBUGS("AppInit") << "loading credentials from gLoginHandler" << LL_ENDL; - display_startup(); +// display_startup(); gUserCredential = gLoginHandler.initializeLoginInfo(); - display_startup(); +// display_startup(); } // Make sure the process dialog doesn't hide things - display_startup(); +// display_startup(); gViewerWindow->setShowProgress(FALSE); - display_startup(); +// display_startup(); // Show the login dialog login_show(); - display_startup(); +// display_startup(); // connect dialog is already shown, so fill in the names if (gUserCredential.notNull()) { LLPanelLogin::setFields( gUserCredential, gRememberPassword); } - display_startup(); +// display_startup(); LLPanelLogin::giveFocus(); // MAINT-3231 Show first run dialog only for Desura viewer @@ -787,22 +787,22 @@ bool idle_startup() LLStartUp::setStartupState( STATE_LOGIN_CLEANUP ); } - display_startup(); +// display_startup(); gViewerWindow->setNormalControlsVisible( FALSE ); - display_startup(); +// display_startup(); gLoginMenuBarView->setVisible( TRUE ); - display_startup(); +// display_startup(); gLoginMenuBarView->setEnabled( TRUE ); - display_startup(); +// display_startup(); show_debug_menus(); - display_startup(); +// display_startup(); // Hide the splash screen LLSplashScreen::hide(); - display_startup(); +// display_startup(); // Push our window frontmost gViewerWindow->getWindow()->show(); - display_startup(); +// display_startup(); // DEV-16927. The following code removes errant keystrokes that happen while the window is being // first made visible. @@ -810,9 +810,10 @@ bool idle_startup() MSG msg; while( PeekMessage( &msg, /*All hWnds owned by this thread */ NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE ) ) { } - display_startup(); +// display_startup(); #endif - timeout.reset(); + display_startup(); + timeout.reset(); return FALSE; } -- cgit v1.2.3