diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-03-01 02:25:50 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-03-01 02:25:50 +0200 |
| commit | 2ab914a9cdd1ad809879aca05dbf4b624949ecea (patch) | |
| tree | c2eb5d49ad6d0db73cf2374704ede44370910d12 /indra/newview/lllogininstance.h | |
| parent | de91391bdd71dd7c9634cf9a736e1032d0fe983e (diff) | |
| parent | 36cb6933e6c1ad92e1887503b74a05c32988b0f1 (diff) | |
Merged in lindenlab/viewer-bear
Diffstat (limited to 'indra/newview/lllogininstance.h')
| -rw-r--r-- | indra/newview/lllogininstance.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/lllogininstance.h b/indra/newview/lllogininstance.h index 651ad10afb..b759b43474 100644 --- a/indra/newview/lllogininstance.h +++ b/indra/newview/lllogininstance.h @@ -28,8 +28,10 @@ #define LL_LLLOGININSTANCE_H #include "lleventdispatcher.h" +#include "lleventapi.h" #include <boost/scoped_ptr.hpp> #include <boost/function.hpp> +#include <memory> // std::shared_ptr #include "llsecapi.h" class LLLogin; class LLEventStream; @@ -68,6 +70,7 @@ public: LLNotificationsInterface& getNotificationsInterface() const { return *mNotifications; } private: + typedef std::shared_ptr<LLEventAPI::Response> ResponsePtr; void constructAuthParams(LLPointer<LLCredential> user_credentials); void updateApp(bool mandatory, const std::string& message); bool updateDialogCallback(const LLSD& notification, const LLSD& response); @@ -77,7 +80,8 @@ private: void handleLoginSuccess(const LLSD& event); void handleDisconnect(const LLSD& event); void handleIndeterminate(const LLSD& event); - void handleLoginDisallowed(const LLSD& notification, const LLSD& response); + void handleLoginDisallowed(const LLSD& notification, const LLSD& response); + void syncWithUpdater(ResponsePtr resp, const LLSD& notification, const LLSD& response); bool handleTOSResponse(bool v, const std::string& key); |