From 11f2ad21590147e4d426320d1d336a3dac82a34b Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Tue, 7 Dec 2010 10:35:37 -0800
Subject: login instance coordinates with updater service

---
 indra/newview/lllogininstance.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/lllogininstance.h')

diff --git a/indra/newview/lllogininstance.h b/indra/newview/lllogininstance.h
index 159e05046c..cb1f56a971 100644
--- a/indra/newview/lllogininstance.h
+++ b/indra/newview/lllogininstance.h
@@ -34,6 +34,7 @@
 class LLLogin;
 class LLEventStream;
 class LLNotificationsInterface;
+class LLUpdaterService;
 
 // This class hosts the login module and is used to 
 // negotiate user authentication attempts.
@@ -75,6 +76,7 @@ public:
 	typedef boost::function<void()> UpdaterLauncherCallback;
 	void setUpdaterLauncher(const UpdaterLauncherCallback& ulc) { mUpdaterLauncher = ulc; }
 
+	void setUpdaterService(LLUpdaterService * updaterService) { mUpdaterService = updaterService; }
 private:
 	void constructAuthParams(LLPointer<LLCredential> user_credentials);
 	void updateApp(bool mandatory, const std::string& message);
@@ -104,6 +106,7 @@ private:
 	int mLastExecEvent;
 	UpdaterLauncherCallback mUpdaterLauncher;
 	LLEventDispatcher mDispatcher;
+	LLUpdaterService * mUpdaterService;
 };
 
 #endif
-- 
cgit v1.3


From 7887bdfd5c5488f49e48df1eae67ab30faabb1da Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Fri, 10 Dec 2010 11:03:34 -0800
Subject: destroy updater state machine if login instance destroyed.

---
 indra/newview/lllogininstance.cpp | 10 +++++++++-
 indra/newview/lllogininstance.h   |  5 ++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'indra/newview/lllogininstance.h')

diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp
index 1858cbdcd9..8d9d7298f8 100644
--- a/indra/newview/lllogininstance.cpp
+++ b/indra/newview/lllogininstance.cpp
@@ -64,8 +64,15 @@
 #include <boost/scoped_ptr.hpp>
 #include <sstream>
 
+class LLLoginInstance::Disposable {
+public:
+	virtual ~Disposable() {}
+};
+
 namespace {
-	class MandatoryUpdateMachine {
+	class MandatoryUpdateMachine:
+		public LLLoginInstance::Disposable
+	{
 	public:
 		MandatoryUpdateMachine(LLLoginInstance & loginInstance, LLUpdaterService & updaterService);
 		
@@ -754,6 +761,7 @@ void LLLoginInstance::updateApp(bool mandatory, const std::string& auth_msg)
 	{
 		gViewerWindow->setShowProgress(false);
 		MandatoryUpdateMachine * machine = new MandatoryUpdateMachine(*this, *mUpdaterService);
+		mUpdateStateMachine.reset(machine);
 		machine->start();
 		return;
 	}
diff --git a/indra/newview/lllogininstance.h b/indra/newview/lllogininstance.h
index cb1f56a971..b872d7d1b1 100644
--- a/indra/newview/lllogininstance.h
+++ b/indra/newview/lllogininstance.h
@@ -41,6 +41,8 @@ class LLUpdaterService;
 class LLLoginInstance : public LLSingleton<LLLoginInstance>
 {
 public:
+	class Disposable;
+
 	LLLoginInstance();
 	~LLLoginInstance();
 
@@ -106,7 +108,8 @@ private:
 	int mLastExecEvent;
 	UpdaterLauncherCallback mUpdaterLauncher;
 	LLEventDispatcher mDispatcher;
-	LLUpdaterService * mUpdaterService;
+	LLUpdaterService * mUpdaterService;	
+	boost::scoped_ptr<Disposable> mUpdateStateMachine;
 };
 
 #endif
-- 
cgit v1.3