diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-23 12:18:46 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-23 12:18:46 -0700 |
| commit | 4ddaa866dde7a92e56617a32464e0667de3759ef (patch) | |
| tree | d28e7e39f8a5f4a1070482154824fbfb2a7b52e8 /indra/newview/lleventinfo.h | |
| parent | a5453d45feaceb713c7cece76d88c2d2b8f825c6 (diff) | |
| parent | 80b682d4b4dd1256ee09dd3327d2c51e3adee0b5 (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; |