diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-10 06:57:52 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-10 07:08:25 +0300 |
| commit | 84dfe55810815e8c274044cea5c81aaed89a787f (patch) | |
| tree | 4e499acfe5617682c5eca52998b5c10cdac8609a /indra/newview/llfloaterimnearbychathandler.cpp | |
| parent | 16e638db975278f6018fe1e21ba1954b7f159149 (diff) | |
| parent | da9a1dcb55548a249ff7a1255f3e518696b81245 (diff) | |
Merge branch 'main' into marchcat/y-merge
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
Diffstat (limited to 'indra/newview/llfloaterimnearbychathandler.cpp')
| -rw-r--r-- | indra/newview/llfloaterimnearbychathandler.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfloaterimnearbychathandler.cpp b/indra/newview/llfloaterimnearbychathandler.cpp index ef4b71b3af..dfee4096fe 100644 --- a/indra/newview/llfloaterimnearbychathandler.cpp +++ b/indra/newview/llfloaterimnearbychathandler.cpp @@ -522,6 +522,8 @@ void LLFloaterIMNearbyChatHandler::processChat(const LLChat& chat_msg, // errors in separate window. if (chat_msg.mChatType == CHAT_TYPE_DEBUG_MSG) { + if (LLFloater::isQuitRequested()) return; + if(gSavedSettings.getBOOL("ShowScriptErrors") == FALSE) return; |