1 files changed, 14 insertions, 10 deletions
diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp
index df59283bc4..b4d0bb6823 100755
--- a/indra/newview/lllogininstance.cpp
+++ b/indra/newview/lllogininstance.cpp
@@ -58,7 +58,6 @@
 #include "llmachineid.h"
 #include "llupdaterservice.h"
 #include "llevents.h"
-#include "llnotificationsutil.h"
 #include "llappviewer.h"
 
 #include <boost/scoped_ptr.hpp>
@@ -75,9 +74,14 @@ namespace {
 	{
 	public:
 		MandatoryUpdateMachine(LLLoginInstance & loginInstance, LLUpdaterService & updaterService);
-		
+
 		void start(void);
-		
+
+		LLNotificationsInterface& getNotificationsInterface() const
+		{
+			return mLoginInstance.getNotificationsInterface();
+		}
+
 	private:
 		class State;
 		class CheckingForUpdate;
@@ -85,9 +89,9 @@ namespace {
 		class ReadyToInstall; 
 		class StartingUpdaterService;
 		class WaitingForDownload;
-		
-		LLLoginInstance & mLoginInstance;
+
 		boost::scoped_ptr<State> mState;
+		LLLoginInstance &  mLoginInstance;
 		LLUpdaterService & mUpdaterService;
 		
 		void setCurrentState(State * newState);
@@ -145,7 +149,7 @@ namespace {
 		virtual void exit(void);
 		
 	private:
-		MandatoryUpdateMachine & mMachine;
+		//MandatoryUpdateMachine & mMachine;
 	};
 	
 	
@@ -328,7 +332,7 @@ MandatoryUpdateMachine::Error::Error(MandatoryUpdateMachine & machine):
 void MandatoryUpdateMachine::Error::enter(void)
 {
 	LL_INFOS() << "entering error" << LL_ENDL;
-	LLNotificationsUtil::add("FailedRequiredUpdateInstall", LLSD(), LLSD(), boost::bind(&MandatoryUpdateMachine::Error::onButtonClicked, this, _1, _2));
+	mMachine.getNotificationsInterface().add("FailedRequiredUpdateInstall", LLSD(), LLSD(), boost::bind(&MandatoryUpdateMachine::Error::onButtonClicked, this, _1, _2));
 }
 
 
@@ -349,8 +353,8 @@ void MandatoryUpdateMachine::Error::onButtonClicked(const LLSD &, const LLSD &)
 //-----------------------------------------------------------------------------
 
 
-MandatoryUpdateMachine::ReadyToInstall::ReadyToInstall(MandatoryUpdateMachine & machine):
-	mMachine(machine)
+MandatoryUpdateMachine::ReadyToInstall::ReadyToInstall(MandatoryUpdateMachine & machine) //:
+	//mMachine(machine)
 {
 	; // No op.
 }
@@ -384,7 +388,7 @@ MandatoryUpdateMachine::StartingUpdaterService::StartingUpdaterService(Mandatory
 void MandatoryUpdateMachine::StartingUpdaterService::enter(void)
 {
 	LL_INFOS() << "entering start update service" << LL_ENDL;
-	LLNotificationsUtil::add("UpdaterServiceNotRunning", LLSD(), LLSD(), boost::bind(&MandatoryUpdateMachine::StartingUpdaterService::onButtonClicked, this, _1, _2));
+	mMachine.getNotificationsInterface().add("UpdaterServiceNotRunning", LLSD(), LLSD(), boost::bind(&MandatoryUpdateMachine::StartingUpdaterService::onButtonClicked, this, _1, _2));
 }