diff options
author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-20 16:20:40 -0800 |
---|---|---|
committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-20 16:20:40 -0800 |
commit | 67bc42a80ac0c125a719e2d48c974f9259c04551 (patch) | |
tree | e76b0c3acf0a53d98fb7a7fbc79d912bbb916588 /indra/newview/llpanelgrouproles.h | |
parent | 1ece38912188650c9bc5a1cf906ca4a88acc21c4 (diff) | |
parent | cca22d608deb26cf21b33629b170e70a0e221575 (diff) |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
Diffstat (limited to 'indra/newview/llpanelgrouproles.h')
-rw-r--r-- | indra/newview/llpanelgrouproles.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelgrouproles.h b/indra/newview/llpanelgrouproles.h index a55e264150..8b454e020a 100644 --- a/indra/newview/llpanelgrouproles.h +++ b/indra/newview/llpanelgrouproles.h @@ -188,7 +188,7 @@ public: virtual void setGroupID(const LLUUID& id); void addMemberToList(LLUUID id, LLGroupMemberData* data); - void onNameCache(const LLUUID& update_id, const LLUUID& id); + void onNameCache(const LLUUID& update_id, LLGroupMemberData* member, const LLUUID& id, const LLAvatarName& av_name); protected: typedef std::map<LLUUID, LLRoleMemberChangeType> role_change_data_map_t; |