diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-05-29 12:42:53 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-05-29 12:42:53 -0400 |
| commit | 81870e09c98da59bf64289e3fe46f4e4281876d3 (patch) | |
| tree | d9e1a28b3e0e732c6b32d2ea67f5f56de6bc8a7a /indra/newview/llimview.cpp | |
| parent | b2baee8e34a141c28fd2a7b60566558c1019c0a9 (diff) | |
| parent | 5db5102fe05f7d2ef3535516da269abb276dad6b (diff) | |
merge changes for DRTVWR-148
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index a7c4618fa4..4000570872 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -3237,7 +3237,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(); @@ -3255,14 +3254,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; } |