diff options
author | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:46:09 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:46:09 -0500 |
commit | e2f197b6f77592c84d0c2967cc0e8110c79f2f49 (patch) | |
tree | c405316265ca4248802817b8a99697063c58469d /indra/newview/lllogininstance.h | |
parent | 2d9c970babf6bab8d402482315af6be0ffb198dd (diff) | |
parent | 78895f9e0c628dc33268578faf135e967cf30142 (diff) |
merge changes for storm-398
Diffstat (limited to 'indra/newview/lllogininstance.h')
-rw-r--r-- | indra/newview/lllogininstance.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/lllogininstance.h b/indra/newview/lllogininstance.h index 159e05046c..b872d7d1b1 100644 --- a/indra/newview/lllogininstance.h +++ b/indra/newview/lllogininstance.h @@ -34,12 +34,15 @@ class LLLogin; class LLEventStream; class LLNotificationsInterface; +class LLUpdaterService; // This class hosts the login module and is used to // negotiate user authentication attempts. class LLLoginInstance : public LLSingleton<LLLoginInstance> { public: + class Disposable; + LLLoginInstance(); ~LLLoginInstance(); @@ -75,6 +78,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 +108,8 @@ private: int mLastExecEvent; UpdaterLauncherCallback mUpdaterLauncher; LLEventDispatcher mDispatcher; + LLUpdaterService * mUpdaterService; + boost::scoped_ptr<Disposable> mUpdateStateMachine; }; #endif |