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 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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

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;
 	}
-- 
cgit v1.2.3