diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-04-19 16:27:38 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-04-19 16:27:38 -0400 |
| commit | 1b032c37833be3a03170a28b1955c55061936442 (patch) | |
| tree | f4500e347b6f18eeafe61217c4a9f884a8ebea34 /indra/newview/llgroupmgr.cpp | |
| parent | e07a60f6cc80d052377996b8c3ef9a9a20e20584 (diff) | |
| parent | f62b5503285d828813d87779fa0658ee5f122ac5 (diff) | |
merge changes for 5.0.4-release
Diffstat (limited to 'indra/newview/llgroupmgr.cpp')
| -rw-r--r-- | indra/newview/llgroupmgr.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp index 7545112ab9..152d0eddcd 100644 --- a/indra/newview/llgroupmgr.cpp +++ b/indra/newview/llgroupmgr.cpp @@ -38,6 +38,7 @@ #include "llappviewer.h" #include "llagent.h" +#include "llavatarnamecache.h" #include "llui.h" #include "message.h" #include "roles_constants.h" @@ -54,6 +55,7 @@ #include <boost/regex.hpp> #include "llcorehttputil.h" + #if LL_MSVC #pragma warning(push) // disable boost::lexical_cast warning @@ -819,9 +821,9 @@ void LLGroupMgrGroupData::banMemberById(const LLUUID& participant_uuid) LLGroupMgr::getInstance()->sendGroupMemberEjects(mID, ids); LLGroupMgr::getInstance()->sendGroupMembersRequest(mID); LLSD args; - std::string name; - gCacheName->getFullName(participant_uuid, name); - args["AVATAR_NAME"] = name; + LLAvatarName av_name; + LLAvatarNameCache::get(participant_uuid, &av_name); + args["AVATAR_NAME"] = av_name.getUserName(); args["GROUP_NAME"] = mName; LLNotifications::instance().add(LLNotification::Params("EjectAvatarFromGroup").substitutions(args)); } |