diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-03-10 15:46:49 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-03-10 15:46:49 -0400 |
| commit | 2b4d3fff706d098076bb6c0a7dce2ca35b83300f (patch) | |
| tree | 68f8adf2151b2acab4c561048fa13a52a997e6e5 /indra/newview/llpanelgrouproles.h | |
| parent | 208d9a2d21d380a33ce8f1a5a75813222965f62e (diff) | |
back out STORM-2011 due to conflict
Diffstat (limited to 'indra/newview/llpanelgrouproles.h')
| -rwxr-xr-x | indra/newview/llpanelgrouproles.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llpanelgrouproles.h b/indra/newview/llpanelgrouproles.h index baa2d40c7e..0cf272f3ee 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, const LLUUID& av_id); + void onNameCache(const LLUUID& update_id, LLGroupMemberData* member, const LLAvatarName& av_name); protected: typedef std::map<LLUUID, LLRoleMemberChangeType> role_change_data_map_t; @@ -215,8 +215,7 @@ protected: U32 mNumOwnerAdditions; LLGroupMgrGroupData::member_list_t::iterator mMemberProgress; - typedef std::map<LLUUID, boost::signals2::connection> avatar_name_cache_connection_map_t; - avatar_name_cache_connection_map_t mAvatarNameCacheConnections; + boost::signals2::connection mAvatarNameCacheConnection; }; class LLPanelGroupRolesSubTab : public LLPanelGroupSubTab |