summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2017-01-23 19:51:58 +0200
committerAndreyL ProductEngine <alihatskiy@productengine.com>2017-01-23 19:51:58 +0200
commite2bb0c170eb3f7db73fa8d96336f3920552937b2 (patch)
tree6fbb2511d3155b2a9239ffb30eb7ba02fb344e56 /indra/newview
parentb64fe9899d5368acdb77c7838675a3439e01c243 (diff)
MAINT-1322 IMs from users with muted voice (but not text) should be received
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llimview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 2405c3a1a3..5b797a3f25 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -2703,7 +2703,7 @@ void LLIMMgr::addMessage(
// Logically it would make more sense to reject the session sooner, in another area of the
// code, but the session has to be established inside the server before it can be left.
- if (LLMuteList::getInstance()->isMuted(other_participant_id) && !from_linden)
+ if (LLMuteList::getInstance()->isMuted(other_participant_id, LLMute::flagTextChat) && !from_linden)
{
LL_WARNS() << "Leaving IM session from initiating muted resident " << from << LL_ENDL;
if(!gIMMgr->leaveSession(new_session_id))