diff options
Diffstat (limited to 'linden/indra/newview/rlvhandler.h')
-rw-r--r-- | linden/indra/newview/rlvhandler.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/linden/indra/newview/rlvhandler.h b/linden/indra/newview/rlvhandler.h index 505bfd5..4470632 100644 --- a/linden/indra/newview/rlvhandler.h +++ b/linden/indra/newview/rlvhandler.h | |||
@@ -14,17 +14,11 @@ | |||
14 | #include "rlvmultistringsearch.h" | 14 | #include "rlvmultistringsearch.h" |
15 | 15 | ||
16 | // ============================================================================ | 16 | // ============================================================================ |
17 | /* | ||
18 | * RlvHandler | ||
19 | * ========== | ||
20 | * | ||
21 | */ | ||
22 | 17 | ||
23 | typedef std::map<LLUUID, RlvObject> rlv_object_map_t; | 18 | typedef std::map<LLUUID, RlvObject> rlv_object_map_t; |
24 | typedef std::multimap<S32, LLUUID> rlv_detach_map_t; | 19 | typedef std::multimap<S32, LLUUID> rlv_detach_map_t; |
25 | typedef std::map<S32, LLUUID> rlv_reattach_map_t; | 20 | typedef std::map<S32, LLUUID> rlv_reattach_map_t; |
26 | typedef std::multimap<LLUUID, ERlvBehaviour> rlv_exception_map_t; | 21 | typedef std::multimap<LLUUID, ERlvBehaviour> rlv_exception_map_t; |
27 | typedef std::map<S32, RlvRedirInfo> rlv_redir_map_t; | ||
28 | 22 | ||
29 | class RlvHandler | 23 | class RlvHandler |
30 | { | 24 | { |
@@ -195,6 +189,7 @@ public: | |||
195 | protected: | 189 | protected: |
196 | BOOL processAddCommand(const LLUUID& uuid, const RlvCommand& rlvCmd); | 190 | BOOL processAddCommand(const LLUUID& uuid, const RlvCommand& rlvCmd); |
197 | BOOL processRemoveCommand(const LLUUID& uuid, const RlvCommand& rlvCmd); | 191 | BOOL processRemoveCommand(const LLUUID& uuid, const RlvCommand& rlvCmd); |
192 | BOOL processClearCommand(const LLUUID& idObj, const RlvCommand& rlvCmd); | ||
198 | BOOL processReplyCommand(const LLUUID& uuid, const RlvCommand& rlvCmd) const; | 193 | BOOL processReplyCommand(const LLUUID& uuid, const RlvCommand& rlvCmd) const; |
199 | BOOL processForceCommand(const LLUUID& uuid, const RlvCommand& rlvCmd) const; | 194 | BOOL processForceCommand(const LLUUID& uuid, const RlvCommand& rlvCmd) const; |
200 | 195 | ||
@@ -235,7 +230,6 @@ protected: | |||
235 | rlv_retained_list_t m_Retained; | 230 | rlv_retained_list_t m_Retained; |
236 | rlv_reattach_map_t m_AttachPending; | 231 | rlv_reattach_map_t m_AttachPending; |
237 | rlv_reattach_map_t m_DetachPending; | 232 | rlv_reattach_map_t m_DetachPending; |
238 | rlv_redir_map_t m_Redirections; | ||
239 | RlvGCTimer* m_pGCTimer; | 233 | RlvGCTimer* m_pGCTimer; |
240 | RlvWLSnapshot* m_pWLSnapshot; | 234 | RlvWLSnapshot* m_pWLSnapshot; |
241 | 235 | ||