diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-11-05 17:20:42 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-11-05 17:20:42 -0500 |
| commit | bf6d1670756ba96abde570e7dbbf94c62c71ca5b (patch) | |
| tree | be67669c54a5d9629a2e53c2387f9be7d917c8f4 /indra/newview/llgroupmgr.h | |
| parent | 5f4d1d804622572d02063d5712e6f5be68752e8d (diff) | |
| parent | bfd6a0c6b9bb4b05d6705c722d330b49195d5b0c (diff) | |
pull back DRTVWR-217 and tag for 3.4.2-beta1
Diffstat (limited to 'indra/newview/llgroupmgr.h')
| -rw-r--r-- | indra/newview/llgroupmgr.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llgroupmgr.h b/indra/newview/llgroupmgr.h index df3cd17e03..62b2978f21 100644 --- a/indra/newview/llgroupmgr.h +++ b/indra/newview/llgroupmgr.h @@ -340,6 +340,10 @@ public: static void sendGroupMemberEjects(const LLUUID& group_id, uuid_vec_t& member_ids); + // BAKER + void sendCapGroupMembersRequest(const LLUUID& group_id); + static void processCapGroupMembersRequest(const LLSD& content); + void cancelGroupRoleChanges(const LLUUID& group_id); static void processGroupPropertiesReply(LLMessageSystem* msg, void** data); @@ -375,6 +379,8 @@ private: typedef std::set<LLParticularGroupObserver*> observer_set_t; typedef std::map<LLUUID,observer_set_t> observer_map_t; observer_map_t mParticularObservers; + + S32 mLastGroupMembersRequestFrame; }; |