diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2009-05-11 20:05:46 +0000 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2009-05-11 20:05:46 +0000 |
commit | dc934629919bdcaea72c78e5291263914fb958ec (patch) | |
tree | 0ac81213f607d9a3a133481758fa2274fe986aa3 /indra/newview/lleventinfo.h | |
parent | 3800c0df910c83e987184d541b868168fc2b5bec (diff) |
svn merge -r113003:119136 svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-2 svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-3
Diffstat (limited to 'indra/newview/lleventinfo.h')
-rw-r--r-- | indra/newview/lleventinfo.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/lleventinfo.h b/indra/newview/lleventinfo.h index 880517a9f4..493c659983 100644 --- a/indra/newview/lleventinfo.h +++ b/indra/newview/lleventinfo.h @@ -37,7 +37,6 @@ #include "v3dmath.h" #include "lluuid.h" -#include "lluserauth.h" class LLMessageSystem; @@ -48,7 +47,7 @@ public: void unpack(LLMessageSystem *msg); - static void loadCategories(LLUserAuth::options_t event_options); + static void loadCategories(const LLSD& options); public: std::string mName; |