diff options
author | skolb <> | 2009-12-18 10:54:16 -0800 |
---|---|---|
committer | skolb <> | 2009-12-18 10:54:16 -0800 |
commit | d5b53eb483ec042d83859ec957dce7699c7469aa (patch) | |
tree | 289ff588bf8f35bc94fbdf3844279bc8cd299b1a /indra/newview/lloutputmonitorctrl.cpp | |
parent | eb7bd0a214ad794db9cb2acb33c45b9d7f46b981 (diff) | |
parent | ad6d0e3bb766c737b1e9bbd9d006391cc8bcc085 (diff) |
Merge viewer 2 into media
Diffstat (limited to 'indra/newview/lloutputmonitorctrl.cpp')
-rw-r--r-- | indra/newview/lloutputmonitorctrl.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/lloutputmonitorctrl.cpp b/indra/newview/lloutputmonitorctrl.cpp index 39381e3faa..fa16cb6473 100644 --- a/indra/newview/lloutputmonitorctrl.cpp +++ b/indra/newview/lloutputmonitorctrl.cpp @@ -243,7 +243,8 @@ void LLOutputMonitorCtrl::setSpeakerId(const LLUUID& speaker_id) } else { - setIsMuted(LLMuteList::getInstance()->isMuted(mSpeakerId)); + // check only blocking on voice. EXT-3542 + setIsMuted(LLMuteList::getInstance()->isMuted(mSpeakerId, LLMute::flagVoiceChat)); LLMuteList::getInstance()->addObserver(this); } } @@ -251,5 +252,6 @@ void LLOutputMonitorCtrl::setSpeakerId(const LLUUID& speaker_id) void LLOutputMonitorCtrl::onChange() { - setIsMuted(LLMuteList::getInstance()->isMuted(mSpeakerId)); + // check only blocking on voice. EXT-3542 + setIsMuted(LLMuteList::getInstance()->isMuted(mSpeakerId, LLMute::flagVoiceChat)); } |