summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew A. de Laix <alain@lindenlab.com>2010-12-08 13:59:45 -0800
committerAndrew A. de Laix <alain@lindenlab.com>2010-12-08 13:59:45 -0800
commit27aebda80f302e77a204f5c1931d3e52c6034edb (patch)
tree505aaf676f5d4a4f7afdc56f6509baa785332fac
parent115851ce14b7aff83027f9d4d2ec32b3ce448c56 (diff)
progress viewer will no longer fade out if toggled quickly from visible to invisible to visible again.
-rw-r--r--indra/newview/llprogressview.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp
index e9504cbba0..250dfc5713 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);
- }
+ }
}