diff options
| author | Simon Linden <simon@lindenlab.com> | 2014-07-18 22:39:50 +0000 |
|---|---|---|
| committer | Simon Linden <simon@lindenlab.com> | 2014-07-18 22:39:50 +0000 |
| commit | 7021288859036789dc268233cc1a3401d6082721 (patch) | |
| tree | 2d6a4d9e87785a8bc236215e5e0102a553a0ee5f /indra/newview/llviewermessage.cpp | |
| parent | 7714c7679da7c6c28c3f3f09af6b586a680dc26c (diff) | |
| parent | 19bc1ee671df2f89d990dfe8aadea1d9ea424e82 (diff) | |
Pull in viewer-lion to cut off DRTVWR-373
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rwxr-xr-x | indra/newview/llviewermessage.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 9d5c3c4d4a..703c6d87c6 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3767,6 +3767,15 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data) LLNotificationsUI::LLNotificationManager::instance().onChat(chat, args); } + // don't call notification for debug messages from not owned objects + if (chat.mChatType == CHAT_TYPE_DEBUG_MSG) + { + if (gAgentID != chat.mOwnerID) + { + return; + } + } + LLSD msg_notify = LLSD(LLSD::emptyMap()); msg_notify["session_id"] = LLUUID(); msg_notify["from_id"] = chat.mFromID; |