summaryrefslogtreecommitdiff
path: root/indra/newview/llprogressview.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llprogressview.cpp')
-rw-r--r--indra/newview/llprogressview.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp
index 1257ee7f94..c17b86783d 100644
--- a/indra/newview/llprogressview.cpp
+++ b/indra/newview/llprogressview.cpp
@@ -175,6 +175,10 @@ void LLProgressView::setStartupComplete()
void LLProgressView::setVisible(BOOL visible)
{
+ if (!visible && mFadeFromLoginTimer.getStarted())
+ {
+ mFadeFromLoginTimer.stop();
+ }
// hiding progress view
if (getVisible() && !visible)
{