diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-06-14 10:55:25 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-06-14 10:55:25 -0700 |
| commit | baf9b3cb078c04b019fccc4ae8a54db05b14bdef (patch) | |
| tree | aa422043ec900036716d35e73240efc9df152d32 /indra/newview/llnearbychathandler.cpp | |
| parent | 76cf9e29a77566c10da6184833fad6b0912e9688 (diff) | |
| parent | fbc95fe7e77ed093f8f7938a4755ce6b175dcaff (diff) | |
Merge
Diffstat (limited to 'indra/newview/llnearbychathandler.cpp')
| -rw-r--r-- | indra/newview/llnearbychathandler.cpp | 8 |
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")) { |