diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-10-23 12:15:22 -0700 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-23 12:15:22 -0700 |
commit | 127b428863707c882fbf4d30699321b8a2365644 (patch) | |
tree | 728c98bd177635891f0646ccabcf86b70341d4a0 /indra/newview/lleventinfo.h | |
parent | 0220106ecdecd323854522a5bc3fd6455c60fdfc (diff) | |
parent | 2438a9168b117dcabf5e5819f93e08a874735a26 (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; |