summaryrefslogtreecommitdiff
path: root/indra/newview/llchathistory.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2017-04-19 16:02:48 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2017-04-19 16:02:48 -0400
commitde5cbddf7918c45c46a1c3a569bdb1adaf3dde06 (patch)
tree35a11fbfffc2d4e01d2f1f7450ea62614fc48919 /indra/newview/llchathistory.cpp
parent8d12ef71a0de00f7bb3ecce61b7fe3a84bda1b88 (diff)
parentf62b5503285d828813d87779fa0658ee5f122ac5 (diff)
merge
Diffstat (limited to 'indra/newview/llchathistory.cpp')
-rw-r--r--indra/newview/llchathistory.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 5d2997688f..9798ef3529 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -271,9 +271,9 @@ public:
void mute(const LLUUID& participant_id, U32 flags)
{
BOOL is_muted = LLMuteList::getInstance()->isMuted(participant_id, flags);
- std::string name;
- gCacheName->getFullName(participant_id, name);
- LLMute mute(participant_id, name, LLMute::AGENT);
+ LLAvatarName av_name;
+ LLAvatarNameCache::get(participant_id, &av_name);
+ LLMute mute(participant_id, av_name.getUserName(), LLMute::AGENT);
if (!is_muted)
{