diff options
| author | callum <none@none> | 2011-01-05 15:52:43 -0800 |
|---|---|---|
| committer | callum <none@none> | 2011-01-05 15:52:43 -0800 |
| commit | b9ca6c553cf158c5b485947f8b560228a196c1d7 (patch) | |
| tree | df710eb467a1c0fbfb5d7906232f23a36f6fc7c1 /indra/newview/llprogressview.cpp | |
| parent | ed3ea14984e322462ed466805e47b29a6f658279 (diff) | |
| parent | d5a0c56bf5d933b7cee072cbc1851a626e672ded (diff) | |
Merge with 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); - } + } } |