diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-23 19:41:44 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-23 19:41:44 -0500 |
| commit | 5a4bb72b8d37ca51deb84e1490fdefe2908d2d59 (patch) | |
| tree | 9a22b0583bb290a242df3c619665fdb692e1ecef /indra/newview/llprogressview.cpp | |
| parent | 86380bb177b9e18e345bc302efb3a84b2c5758a9 (diff) | |
| parent | 49de8add8355455da4b6ec5aaa55427fafa94322 (diff) | |
Automated merge with ssh://bitbucket.org/aleric/viewer-development-aleric-export
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); - } + } } |