diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-12-22 23:24:58 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-12-22 23:24:58 -0800 |
| commit | 49de8add8355455da4b6ec5aaa55427fafa94322 (patch) | |
| tree | 5a068501f2332eb7641dfe14f4508869d3635bad /indra/newview/llprogressview.cpp | |
| parent | c86d6a7bbb7c0db7665b76cf52b12b90c6e98c6d (diff) | |
| parent | e1b198a36b051051941c61d0a558766591ed4cfc (diff) | |
STORM-810 : Auto update and related changes (integration request from team chopper)
Diffstat (limited to 'indra/newview/llprogressview.cpp')
| -rw-r--r-- | indra/newview/llprogressview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index db02d76139..31fde5d58a 100644 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -133,13 +133,13 @@ void LLProgressView::setVisible(BOOL visible) mFadeTimer.start(); } // showing progress view - else if (!getVisible() && visible) + else if (visible && (!getVisible() || mFadeTimer.getStarted())) { setFocus(TRUE); mFadeTimer.stop(); mProgressTimer.start(); LLPanel::setVisible(TRUE); - } + } } |