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/llprogressview.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/llprogressview.cpp') 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.2.3