From 290524e871f9846761db2960ea03c0669f085b30 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Tue, 29 Sep 2015 15:57:50 -0700 Subject: MAINT-5614: Cancel the fade timer for the progress screen when hidding progress. --- indra/newview/llpanellogin.cpp | 14 -------------- indra/newview/llprogressview.cpp | 4 ++++ 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 3743aee00f..360b144604 100755 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -434,24 +434,10 @@ void LLPanelLogin::show(const LLRect &rect, void (*callback)(S32 option, void* user_data), void* callback_data) { -#if 0 if (!LLPanelLogin::sInstance) { new LLPanelLogin(rect, callback, callback_data); } -#else - // instance management - if (LLPanelLogin::sInstance) - { - LL_WARNS("AppInit") << "Duplicate instance of login view deleted" << LL_ENDL; - // Don't leave bad pointer in gFocusMgr - gFocusMgr.setDefaultKeyboardFocus(NULL); - - delete LLPanelLogin::sInstance; - } - - new LLPanelLogin(rect, callback, callback_data); -#endif if( !gFocusMgr.getKeyboardFocus() ) { diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index 1257ee7f94..c17b86783d 100755 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -175,6 +175,10 @@ void LLProgressView::setStartupComplete() void LLProgressView::setVisible(BOOL visible) { + if (!visible && mFadeFromLoginTimer.getStarted()) + { + mFadeFromLoginTimer.stop(); + } // hiding progress view if (getVisible() && !visible) { -- cgit v1.3