diff options
| author | palange <palange@lindenlab.com> | 2009-10-12 19:03:52 -0400 |
|---|---|---|
| committer | palange <palange@lindenlab.com> | 2009-10-12 19:03:52 -0400 |
| commit | dbe7135cc4694e906a7d95a935df70f20514c962 (patch) | |
| tree | 227ed3c9bc717171aeb009067e0f07335bcee8c3 /indra/newview/lleventnotifier.h | |
| parent | d4b2897700c66354413af42ab055bd1aaa47f91c (diff) | |
| parent | e3a4e3dc10a96b0822674cea262f41774e55a660 (diff) | |
merge of login-api
Diffstat (limited to 'indra/newview/lleventnotifier.h')
| -rw-r--r-- | indra/newview/lleventnotifier.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/lleventnotifier.h b/indra/newview/lleventnotifier.h index feb734948c..6fdde87646 100644 --- a/indra/newview/lleventnotifier.h +++ b/indra/newview/lleventnotifier.h @@ -34,7 +34,6 @@ #define LL_LLEVENTNOTIFIER_H #include "llframetimer.h" -#include "lluserauth.h" #include "v3dmath.h" class LLEventInfo; @@ -49,7 +48,7 @@ public: void update(); // Notify the user of the event if it's coming up - void load(const LLUserAuth::options_t& event_options); // In the format that it comes in from LLUserAuth + void load(const LLSD& event_options); // In the format that it comes in from login void add(LLEventInfo &event_info); // Add a new notification for an event void remove(U32 event_id); @@ -69,7 +68,7 @@ public: LLEventNotification(); virtual ~LLEventNotification(); - BOOL load(const LLUserAuth::response_t &en); // In the format it comes in from LLUserAuth + BOOL load(const LLSD& en); // In the format it comes in from login BOOL load(const LLEventInfo &event_info); // From existing event_info on the viewer. //void setEventID(const U32 event_id); //void setEventName(std::string &event_name); |