livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-15014: [OpenSim] osMessageObject(target, message) fails silently

Ansariel 2015-02-04 15:14:59 +01:00
parent eacd9de114
commit 3f38e58fe3
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llfloaterimnearbychathandler.cpp
View File

@ -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
// <FS:Ansariel> 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
// </FS:Ansariel>
{
return;
}

7
indra/newview/llviewermessage.cpp
View File

@ -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)
{
// <FS:Ansariel> 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
// </FS:Ansariel>
{
return;
}