diff options
| -rw-r--r-- | indra/newview/llimview.cpp | 8 | 
1 files changed, 3 insertions, 5 deletions
| diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 8f010850f7..3a5743f309 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -3454,12 +3454,10 @@ public:  				(time_t) message_params["timestamp"].asInteger();  			BOOL is_do_not_disturb = gAgent.isDoNotDisturb(); -			BOOL is_muted = LLMuteList::getInstance()->isMuted( -				from_id, -				name, -				LLMute::flagTextChat); -			if (is_do_not_disturb || is_muted) +			//don't return if user is muted b/c proper way to ignore a muted user who +			//initiated an adhoc/group conference is to create then leave the session (see STORM-1731) +			if (is_do_not_disturb)  			{  				return;  			} | 
