diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-04-01 06:18:49 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-04-01 06:18:49 +0300 |
| commit | 0ff6fa576a653597d0e9dda7f1de5f568e8d6829 (patch) | |
| tree | 21e1b8f1253eedc1cc844553dcf46fef390d5a7d /indra/newview/llprogressview.cpp | |
| parent | a04341efaa63cd6bc47db25c1e4b4bf1e31d90a8 (diff) | |
| parent | eb413ec41e6ee49055464a636a73a7243c172c67 (diff) | |
Merged in lindenlab/viewer-bear
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) { |