diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-01-05 10:37:00 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-01-05 10:37:00 -0500 |
| commit | a7db3b1786e8ac2fc1ee1da306689219ec6aae6a (patch) | |
| tree | 47330782030dbf0ad74984a3afb2db13b69ef660 /indra/newview/llprogressview.cpp | |
| parent | 3348a1ecc0854f249bf31c9dd65cc926b03c0c40 (diff) | |
| parent | 875d36b083582a2c5afdc8f515f203f331269312 (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); - } + } } |