diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-24 09:07:06 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-24 09:07:06 -0500 |
| commit | ef1c3aac889d118530994e878d83426d4fc2ca7c (patch) | |
| tree | dd3d1240a8f5e9b7f1a60d7447b9aa3d624ada88 /indra/newview/llprogressview.cpp | |
| parent | f421e8701b3ef5b0230b06602fc5e937382ccc68 (diff) | |
| parent | 14d830ca43a7114140ebeb16a76829db4d21a95b (diff) | |
merge fix for storm-784
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); - } + } } |