diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-02-01 15:59:08 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-02-01 15:59:08 -0700 |
| commit | f07b332ef0aafd1ecb82b6077309a5292c9cddc1 (patch) | |
| tree | a76fabd4f71bdbb86b7fe6efb9a6acc0529a429c /indra/newview/lloutputmonitorctrl.cpp | |
| parent | baa81473149b9d5a6718529c4de08393e8a02b92 (diff) | |
| parent | 21565a1f3fe1ae737e2f91c58be2c3cb0b5a2fec (diff) | |
Merge branch 'master' into DV525-merge-6.4.13
Diffstat (limited to 'indra/newview/lloutputmonitorctrl.cpp')
| -rw-r--r-- | indra/newview/lloutputmonitorctrl.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/lloutputmonitorctrl.cpp b/indra/newview/lloutputmonitorctrl.cpp index e9fe493d7e..7129641c20 100644 --- a/indra/newview/lloutputmonitorctrl.cpp +++ b/indra/newview/lloutputmonitorctrl.cpp @@ -312,10 +312,14 @@ void LLOutputMonitorCtrl::setSpeakerId(const LLUUID& speaker_id, const LLUUID& s } } -void LLOutputMonitorCtrl::onChange() +void LLOutputMonitorCtrl::onChangeDetailed(const LLMute& mute) { - // check only blocking on voice. EXT-3542 - mIsMuted = LLMuteList::getInstance()->isMuted(mSpeakerId, LLMute::flagVoiceChat); + if (mute.mID == mSpeakerId) + { + // Check only blocking on voice. + // Logic goes in reverse, if flag is set, action is allowed + mIsMuted = !(LLMute::flagVoiceChat & mute.mFlags); + } } // virtual |