diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-09-29 15:57:50 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-09-29 15:57:50 -0700 |
| commit | 290524e871f9846761db2960ea03c0669f085b30 (patch) | |
| tree | 429df8f2607031da4973946b0117f982e88591cd /indra/newview/llprogressview.cpp | |
| parent | 2fe0c321095a8a97ad8d9033430f8cbd4ceddd14 (diff) | |
MAINT-5614: Cancel the fade timer for the progress screen when hidding progress.
Diffstat (limited to 'indra/newview/llprogressview.cpp')
| -rwxr-xr-x | indra/newview/llprogressview.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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) { |