diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-01-31 16:21:50 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-01-31 16:21:50 -0500 |
| commit | 831251785762897a72da2b4dc9fb62731491fe4d (patch) | |
| tree | d4c2d85477608e736a2fd0c2001070fbc0bf8950 /indra/newview/llpanelgrouproles.h | |
| parent | e6de3616c715d94339bd43f25559faaef8ff3c55 (diff) | |
| parent | 86676ec34be7be27f05460deb750d6eb334be0de (diff) | |
merge changes for storm-2011
Diffstat (limited to 'indra/newview/llpanelgrouproles.h')
| -rwxr-xr-x | indra/newview/llpanelgrouproles.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llpanelgrouproles.h b/indra/newview/llpanelgrouproles.h index 0cf272f3ee..baa2d40c7e 100755 --- a/indra/newview/llpanelgrouproles.h +++ b/indra/newview/llpanelgrouproles.h @@ -189,7 +189,7 @@ public: virtual void setGroupID(const LLUUID& id); void addMemberToList(LLGroupMemberData* data); - void onNameCache(const LLUUID& update_id, LLGroupMemberData* member, const LLAvatarName& av_name); + void onNameCache(const LLUUID& update_id, LLGroupMemberData* member, const LLAvatarName& av_name, const LLUUID& av_id); protected: typedef std::map<LLUUID, LLRoleMemberChangeType> role_change_data_map_t; @@ -215,7 +215,8 @@ protected: U32 mNumOwnerAdditions; LLGroupMgrGroupData::member_list_t::iterator mMemberProgress; - boost::signals2::connection mAvatarNameCacheConnection; + typedef std::map<LLUUID, boost::signals2::connection> avatar_name_cache_connection_map_t; + avatar_name_cache_connection_map_t mAvatarNameCacheConnections; }; class LLPanelGroupRolesSubTab : public LLPanelGroupSubTab |