diff options
| author | Oz Linden <oz@lindenlab.com> | 2018-03-09 09:08:02 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2018-03-09 09:08:02 -0500 |
| commit | aae241c43f66c3ef59cb076d00e42f9a857de354 (patch) | |
| tree | 82da2afc116915897a3207cc8eed120aef5ef3fd /indra/newview/llavataractions.cpp | |
| parent | 17bb7f4fc5463e9426179b0ded810b51ef291c79 (diff) | |
| parent | f8c76535a35aaf245e261357a59e977bac5b2501 (diff) | |
merge changes for 5.1.2-release
Diffstat (limited to 'indra/newview/llavataractions.cpp')
| -rw-r--r-- | indra/newview/llavataractions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index 8fe684ad79..f0b74e7439 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -1011,7 +1011,7 @@ void LLAvatarActions::toggleMute(const LLUUID& id, U32 flags) LLAvatarNameCache::get(id, &av_name); LLMuteList* mute_list = LLMuteList::getInstance(); - bool is_muted = mute_list->isMuted(id, LLMute::flagVoiceChat); + bool is_muted = mute_list->isMuted(id, flags); LLMute mute(id, av_name.getUserName(), LLMute::AGENT); if (!is_muted) |