diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-21 15:14:39 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-21 15:14:39 -0500 |
| commit | 4652e26196ed43e3a2fdd5bbb2e6c4b6b8466719 (patch) | |
| tree | de6ce52d54764b0cf7d0c33d17d1cd7e71ffad1b /indra/newview/llprogressview.cpp | |
| parent | 3571e83b6413e0c1050540a6cddeeaa7c6ca91c1 (diff) | |
| parent | 2d6228b4e0454c7d82770748eb572258c402319c (diff) | |
merge changes for storm-869
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); - } + } } |