summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAlexei Arabadji <aarabadji@productengine.com>2010-06-11 17:07:27 +0300
committerAlexei Arabadji <aarabadji@productengine.com>2010-06-11 17:07:27 +0300
commit5ec3357a6ccf6b6f05d99105db8f510fd395f043 (patch)
tree0cd80fb538c1c44a3908243f22937790a888da9d /indra/newview
parentd5cae2e628e21c1b04af3bf3ae57016aef90e1d1 (diff)
EXT-7762 FIXED Added check to avoid showing script errors from not owned objects.
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/570/ --HG-- branch : product-engine
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llnearbychathandler.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp
index 4b5e765c4f..1fadb126e4 100644
--- a/indra/newview/llnearbychathandler.cpp
+++ b/indra/newview/llnearbychathandler.cpp
@@ -32,6 +32,7 @@
#include "llviewerprecompiledheaders.h"
+#include "llagentdata.h" // for gAgentID
#include "llnearbychathandler.h"
#include "llbottomtray.h"
@@ -367,6 +368,13 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg, const LLSD &args)
{
if(gSavedSettings.getBOOL("ShowScriptErrors") == FALSE)
return;
+
+ // don't process debug messages from not owned objects, see EXT-7762
+ if (gAgentID != chat_msg.mOwnerID)
+ {
+ return;
+ }
+
if (gSavedSettings.getS32("ShowScriptErrorsLocation")== 1)// show error in window //("ScriptErrorsAsChat"))
{