diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-10-14 14:03:16 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-10-14 14:03:16 -0700 |
commit | 508686047d5e98934d5fefbb576e54f108df6fe3 (patch) | |
tree | 6d751588cc200395d4fef41e61f4683a83a7ab86 /indra/newview/llpanelgrouproles.cpp | |
parent | 2303ec6213ea7a591e0084e9fc9350b2afddd3c5 (diff) | |
parent | f53f6f20df5c99311103c3d92938ce878d474f13 (diff) |
Merge from http://hg.secondlife.com/viewer-identity (display names)
Diffstat (limited to 'indra/newview/llpanelgrouproles.cpp')
-rw-r--r-- | indra/newview/llpanelgrouproles.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp index 639364ff8d..35f898bfa6 100644 --- a/indra/newview/llpanelgrouproles.cpp +++ b/indra/newview/llpanelgrouproles.cpp @@ -1110,11 +1110,7 @@ void LLPanelGroupMembersSubTab::sendEjectNotifications(const LLUUID& group_id, c for (uuid_vec_t::const_iterator i = selected_members.begin(); i != selected_members.end(); ++i) { LLSD args; - std::string name; - - gCacheName->getFullName(*i, name); - - args["AVATAR_NAME"] = name; + args["AVATAR_NAME"] = LLSLURL("agent", *i, "displayname").getSLURLString(); args["GROUP_NAME"] = group_data->mName; LLNotifications::instance().add(LLNotification::Params("EjectAvatarFromGroup").substitutions(args)); |