diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2010-12-29 12:39:58 -0800 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2010-12-29 12:39:58 -0800 |
| commit | d12b7b347ad4094b96ba2a650ae86dfb9db2a893 (patch) | |
| tree | 1646c252edd36b31cf4ed3efaac0b91995f631e0 /indra/newview/llprogressview.cpp | |
| parent | 98b2f622b709fcacac32e8ad23b8da6479a28a87 (diff) | |
| parent | 087c105317058dc3a011c937a5aceaf87fdecc26 (diff) | |
merge
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); - } + } } |