diff options
| author | leyla_linden <none@none> | 2010-12-31 12:55:04 -0800 |
|---|---|---|
| committer | leyla_linden <none@none> | 2010-12-31 12:55:04 -0800 |
| commit | 350a736d37de282e1e3c22627400d957f0e00dc5 (patch) | |
| tree | 7427e593ce39ad2c50e1f217bad5b211a9eb3928 /indra/newview/llprogressview.cpp | |
| parent | d196348d0f4bd542eee3702329dab28952b8a5e5 (diff) | |
| parent | e3204165b9bb9b36cb11a8d0a4a4040634e707fc (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); - } + } } |