diff options
| author | Don Kjer <don@lindenlab.com> | 2011-01-07 10:48:38 -0800 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-01-07 10:48:38 -0800 |
| commit | 829c2c86975dd80d13008c38246fa8ea0d10529c (patch) | |
| tree | e90bda161771de9f3fcd98e2806e8eed7c4222fc /indra/newview/llprogressview.cpp | |
| parent | a9bc51e6416dd637080c0307de99d5e09d06dcc4 (diff) | |
| parent | c132d20a7433e2d09e3521a15497f661fcbd18b8 (diff) | |
Merge from viewer-development
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); - } + } } |