diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-05-10 18:58:40 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-05-10 18:58:40 +0300 |
| commit | 4440526a8e331f38e5c087e3b446e1c9a3758fd0 (patch) | |
| tree | 74b042096c5a4edb04963b6f492fc840b0fb719e /indra/newview | |
| parent | a5118ccd6721afdf4f8c71cba6007eb7be4d7c19 (diff) | |
STORM-1209 FIX Object continued sending messages after user adding this object to block list.
Applying Joshua's fix.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index ef5968a5e2..345b951d55 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2208,7 +2208,9 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) name = clean_name_from_im(name, dialog); BOOL is_busy = gAgent.getBusy(); - BOOL is_muted = LLMuteList::getInstance()->isMuted(from_id, name, LLMute::flagTextChat); + BOOL is_muted = LLMuteList::getInstance()->isMuted(from_id, name, LLMute::flagTextChat) + // object IMs contain sender object id in session_id (STORM-1209) + || dialog == IM_FROM_TASK && LLMuteList::getInstance()->isMuted(session_id); BOOL is_linden = LLMuteList::getInstance()->isLinden(name); BOOL is_owned_by_me = FALSE; BOOL is_friend = (LLAvatarTracker::instance().getBuddyInfo(from_id) == NULL) ? false : true; |