From 686c7faf7a71c346e56f4a054644cebbf1fb2356 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Tue, 3 Apr 2012 18:33:42 +0300
Subject: MAINT-117 FIXED Login screen didn't hide if you minimized viewer
 window right after pressing "Log In".

---
 indra/newview/llprogressview.cpp | 34 +++++++++++++++++++++++++---------
 indra/newview/llprogressview.h   |  7 +++----
 2 files changed, 28 insertions(+), 13 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp
index 5d7a5b1c59..f86e583b9e 100644
--- a/indra/newview/llprogressview.cpp
+++ b/indra/newview/llprogressview.cpp
@@ -40,6 +40,7 @@
 
 #include "llagent.h"
 #include "llbutton.h"
+#include "llcallbacklist.h"
 #include "llfocusmgr.h"
 #include "llnotifications.h"
 #include "llprogressbar.h"
@@ -72,6 +73,8 @@ LLProgressView::LLProgressView()
 	mStartupComplete(false)
 {
 	mUpdateEvents.listen("self", boost::bind(&LLProgressView::handleUpdate, this, _1));
+	mFadeToWorldTimer.stop();
+	mFadeFromLoginTimer.stop();
 }
 
 BOOL LLProgressView::postBuild()
@@ -87,8 +90,6 @@ BOOL LLProgressView::postBuild()
 
 	mCancelBtn = getChild<LLButton>("cancel_btn");
 	mCancelBtn->setClickedCallback(  LLProgressView::onCancelButtonClicked, NULL );
-	mFadeToWorldTimer.stop();
-	mFadeFromLoginTimer.stop();
 
 	getChild<LLTextBox>("title_text")->setText(LLStringExplicit(LLAppViewer::instance()->getSecondLifeTitle()));
 
@@ -106,6 +107,9 @@ BOOL LLProgressView::postBuild()
 
 LLProgressView::~LLProgressView()
 {
+	// Just in case something went wrong, make sure we deregister our idle callback.
+	gIdleCallbacks.deleteFunction(onIdle, this);
+
 	gFocusMgr.releaseFocusIfNeeded( this );
 
 	sInstance = NULL;
@@ -154,6 +158,7 @@ void LLProgressView::revealIntroPanel()
 	}
 
 	mFadeFromLoginTimer.start();
+	gIdleCallbacks.addFunction(onIdle, this);
 }
 
 void LLProgressView::setStartupComplete()
@@ -236,13 +241,6 @@ void LLProgressView::draw()
 		}
 		
 		LLPanel::draw();
-
-		if (mFadeFromLoginTimer.getElapsedTimeF32() > FADE_TO_WORLD_TIME )
-		{
-			mFadeFromLoginTimer.stop();
-			LLPanelLogin::closePanel();
-		}
-
 		return;
 	}
 
@@ -424,3 +422,21 @@ void LLProgressView::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent even
 		}
 	}
 }
+
+
+// static
+void LLProgressView::onIdle(void* user_data)
+{
+	LLProgressView* self = (LLProgressView*) user_data;
+
+	// Close login panel on mFadeToWorldTimer expiration.
+	if (self->mFadeFromLoginTimer.getStarted() &&
+		self->mFadeFromLoginTimer.getElapsedTimeF32() > FADE_TO_WORLD_TIME)
+	{
+		self->mFadeFromLoginTimer.stop();
+		LLPanelLogin::closePanel();
+
+		// Nothing to do anymore.
+		gIdleCallbacks.deleteFunction(onIdle, user_data);
+	}
+}
diff --git a/indra/newview/llprogressview.h b/indra/newview/llprogressview.h
index fac00ad04d..813576b21d 100644
--- a/indra/newview/llprogressview.h
+++ b/indra/newview/llprogressview.h
@@ -41,6 +41,8 @@ class LLProgressView :
 	public LLViewerMediaObserver
 
 {
+	LOG_CLASS(LLProgressView);
+
 public:
 	LLProgressView();
 	virtual ~LLProgressView();
@@ -74,10 +76,6 @@ public:
 	static void onClickMessage(void*);
 	bool onAlertModal(const LLSD& sd);
 
-	// note - this is not just hiding the intro panel - it also hides the parent panel
-	// and is used when the intro is finished and we want to show the world
-	void removeIntroPanel();
-
 protected:
 	LLProgressBar* mProgressBar;
 	LLMediaCtrl* mMediaCtrl;
@@ -96,6 +94,7 @@ protected:
 	LLEventStream mUpdateEvents; 
 
 	bool handleUpdate(const LLSD& event_data);
+	static void onIdle(void* user_data);
 };
 
 #endif // LL_LLPROGRESSVIEW_H
-- 
cgit v1.2.3