summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2014-06-10 10:59:14 +0300
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2014-06-10 10:59:14 +0300
commit6c84bfb71909a100873be1771181e105e9b9af9e (patch)
treefdfda14d63eb12ef6119ab6d235a471adcdc5f4b /indra
parentc464a119585d20855cf3095781b38ac6f8b2118b (diff)
MAINT-4132 FIXED Don't call notification for debug messages from not owned objects
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llviewermessage.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 7c032f0a3b..281b604924 100755
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -3722,6 +3722,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;