diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-10-26 09:59:39 -0700 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-26 09:59:39 -0700 |
commit | d6e8f32b8073d85db59f2a45a10d622b71c859ae (patch) | |
tree | 953c5efd60338604c229824467270cd8d5a458ce /indra/newview/lleventinfo.h | |
parent | add9298c1e4d74bdb5503722a6c795ea6f30fa11 (diff) | |
parent | 53c972a521cbb92c6c9390c41b250a41dc22cd5a (diff) |
merge
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; |