diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2007-02-09 23:35:12 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2007-02-09 23:35:12 +0000 |
| commit | 5cc44523f79b6cf495d2649fce9bf9e5181787e8 (patch) | |
| tree | af7409521b24318b7c48a7434824178888c17a3e /indra/newview/llviewermessage.cpp | |
| parent | 0009346667872b90d39089c3800ab3e00ce73b51 (diff) | |
Result of svn merge -r57350:57790 svn+ssh://svn/svn/linden/branches/os-patches.001 into release.
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 71e3b5dded..f402fc320b 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1621,7 +1621,17 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) } break; case IM_BUSY_AUTO_RESPONSE: - gIMView->addMessage(session_id, from_id, name, message); + // fix for JIRA issue VWR-20 submitted 13-JAN-2007 - Paul Churchill + if (is_muted) + { + lldebugs << "Ignoring busy response from " << from_id << llendl; + return; + } + else + { + // original code resumes + gIMView->addMessage(session_id, from_id, name, message); + } break; case IM_LURE_USER: @@ -1722,7 +1732,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) LLAvatarTracker::formFriendship(from_id); std::vector<std::string> strings; - strings.push_back( from_id.getString() ); + strings.push_back(from_id.asString()); send_generic_message("requestonlinenotification", strings); args["[NAME]"] = name; |