diff options
| author | angela <angela@lindenlab.com> | 2009-10-24 07:58:31 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-10-24 07:58:31 +0800 |
| commit | f60314f22758daa22d096f2166367258d761d8b4 (patch) | |
| tree | 75cf514e7a51a9d1781cd9ee3e2128991ab1dbc8 /indra/newview/llnearbychat.cpp | |
| parent | 2b69cb9e9cf5209a8156580b74e6662e4cc4243f (diff) | |
EXT-1305 Hook up Script Error preferences -- reviewed by james
Diffstat (limited to 'indra/newview/llnearbychat.cpp')
| -rw-r--r-- | indra/newview/llnearbychat.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index bbab9944f3..148f72703c 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -222,12 +222,14 @@ void LLNearbyChat::addMessage(const LLChat& chat) if (chat.mChatType == CHAT_TYPE_DEBUG_MSG) { - LLFloaterScriptDebug::addScriptLine(chat.mText, - chat.mFromName, - color, - chat.mFromID); - if (!gSavedSettings.getBOOL("ScriptErrorsAsChat")) + if(gSavedSettings.getBOOL("ShowScriptErrors") == FALSE) + return; + if (gSavedSettings.getS32("ShowScriptErrorsLocation")== 1)// show error in window //("ScriptErrorsAsChat")) { + LLFloaterScriptDebug::addScriptLine(chat.mText, + chat.mFromName, + color, + chat.mFromID); return; } } |