From 3f38e58fe3cefa19b33ae065c1ddcc1b84a60468 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 4 Feb 2015 15:14:59 +0100 Subject: [PATCH] FIRE-15014: [OpenSim] osMessageObject(target, message) fails silently --- indra/newview/llfloaterimnearbychathandler.cpp | 8 ++++++++ indra/newview/llviewermessage.cpp | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/indra/newview/llfloaterimnearbychathandler.cpp b/indra/newview/llfloaterimnearbychathandler.cpp index b2a5f8bd18..193db355c8 100755 --- a/indra/newview/llfloaterimnearbychathandler.cpp +++ b/indra/newview/llfloaterimnearbychathandler.cpp @@ -52,6 +52,7 @@ #include "fsconsoleutils.h" #include "fsfloaternearbychat.h" +#include "llviewernetwork.h" //add LLFloaterIMNearbyChatHandler to LLNotificationsUI namespace @@ -607,7 +608,14 @@ void LLFloaterIMNearbyChatHandler::processChat(const LLChat& chat_msg, return; // don't process debug messages from not owned objects, see EXT-7762 + // FIRE-15014: [OpenSim] osMessageObject(target, message) fails silently + //if (gAgentID != chat_msg.mOwnerID) +#ifdef OPENSIM + if (LLGridManager::getInstance()->isInSecondLife() && gAgentID != chat_msg.mOwnerID) +#else if (gAgentID != chat_msg.mOwnerID) +#endif + // { return; } diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 5401b3fb0d..3e62ac0f06 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -4791,7 +4791,14 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data) // don't call notification for debug messages from not owned objects if (chat.mChatType == CHAT_TYPE_DEBUG_MSG) { + // FIRE-15014: [OpenSim] osMessageObject(target, message) fails silently + //if (gAgentID != chat.mOwnerID) +#ifdef OPENSIM + if (LLGridManager::getInstance()->isInSecondLife() && gAgentID != chat.mOwnerID) +#else if (gAgentID != chat.mOwnerID) +#endif + // { return; }