diff options
author | Merov Linden <merov@lindenlab.com> | 2010-10-22 15:13:57 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2010-10-22 15:13:57 -0700 |
commit | d6be4f210bd5dd15338750fa2559a8a3788b275f (patch) | |
tree | 47d5477529789b0d7983cf722e4a75c9ddb072df /indra/newview/llpanelgrouproles.h | |
parent | 07353619d0069acc9933bed2772e0e6925636efb (diff) | |
parent | 9c09665885783ca9a1405529942912aecca4d938 (diff) |
STORM-322 : merge with viewer-development
Diffstat (limited to 'indra/newview/llpanelgrouproles.h')
-rw-r--r-- | indra/newview/llpanelgrouproles.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llpanelgrouproles.h b/indra/newview/llpanelgrouproles.h index 6a773f1ebb..270259c16f 100644 --- a/indra/newview/llpanelgrouproles.h +++ b/indra/newview/llpanelgrouproles.h @@ -187,6 +187,9 @@ public: virtual void setGroupID(const LLUUID& id); + void addMemberToList(LLUUID id, LLGroupMemberData* data); + void onNameCache(const LLUUID& update_id, const LLUUID& id); + protected: typedef std::map<LLUUID, LLRoleMemberChangeType> role_change_data_map_t; typedef std::map<LLUUID, role_change_data_map_t*> member_role_changes_map_t; @@ -207,6 +210,9 @@ protected: BOOL mPendingMemberUpdate; BOOL mHasMatch; + // This id is generated after each user initiated member list update(opening Roles or changing filter) + LLUUID mUdpateSessionID; + member_role_changes_map_t mMemberRoleChangeData; U32 mNumOwnerAdditions; |