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/llfloaterimcontainer.cpp | |
| parent | e07a60f6cc80d052377996b8c3ef9a9a20e20584 (diff) | |
| parent | f62b5503285d828813d87779fa0658ee5f122ac5 (diff) | |
merge changes for 5.0.4-release
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) { |