diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-04-19 16:02:48 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-04-19 16:02:48 -0400 |
| commit | de5cbddf7918c45c46a1c3a569bdb1adaf3dde06 (patch) | |
| tree | 35a11fbfffc2d4e01d2f1f7450ea62614fc48919 /indra/newview/llfloaterimcontainer.cpp | |
| parent | 8d12ef71a0de00f7bb3ecce61b7fe3a84bda1b88 (diff) | |
| parent | f62b5503285d828813d87779fa0658ee5f122ac5 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloaterimcontainer.cpp')
| -rw-r--r-- | indra/newview/llfloaterimcontainer.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index 7007c58b3c..3522932d03 100644 --- a/indra/newview/llfloaterimcontainer.cpp +++ b/indra/newview/llfloaterimcontainer.cpp @@ -2099,9 +2099,10 @@ void LLFloaterIMContainer::toggleAllowTextChat(const LLUUID& participant_uuid) void LLFloaterIMContainer::toggleMute(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) { |