diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2012-04-02 20:36:52 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2012-04-02 20:36:52 +0300 |
| commit | cbbbbcb6c31bca07b3453e622ab5905ea9e193b8 (patch) | |
| tree | 7d918a85418443dd7f15e6308ca40e39405058fc /indra | |
| parent | 8e8976d21627e81f7f83118d37c052383a22e503 (diff) | |
MAINT-180 FIXED Reject group and ad-hoc chat messages from lindens when we are busy.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llimview.cpp | 10 | ||||
| -rwxr-xr-x | indra/newview/llviewermessage.cpp | 2 |
2 files changed, 2 insertions, 10 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index a856bd0bdc..66bfb9a37a 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -3223,7 +3223,6 @@ public: //just like a normal IM //this is just replicated code from process_improved_im //and should really go in it's own function -jwolk - LLChat chat; std::string message = message_params["message"].asString(); std::string name = message_params["from_name"].asString(); @@ -3241,14 +3240,7 @@ public: name, LLMute::flagTextChat); - BOOL is_linden = LLMuteList::getInstance()->isLinden(name); - std::string separator_string(": "); - - chat.mMuted = is_muted && !is_linden; - chat.mFromID = from_id; - chat.mFromName = name; - - if (!is_linden && is_busy) + if (is_busy || is_muted) { return; } diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 3c6770df43..acddd3efe7 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2682,7 +2682,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) case IM_SESSION_SEND: { - if (!is_linden && is_busy) + if (is_busy) { return; } |