diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-04-09 14:17:34 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-04-09 14:17:34 -0700 |
| commit | 5a47a3cb2366b9da9a595d37c88703497e111005 (patch) | |
| tree | 1e255fecfda9bf1582d8d76a48e950a561a811a1 /indra/newview/llfloaterimnearbychathandler.cpp | |
| parent | 03c75201605067b0e97aba0333f8ea6d45d10804 (diff) | |
| parent | da9a1dcb55548a249ff7a1255f3e518696b81245 (diff) | |
Merge remote-tracking branch 'origin/main' into release/materials_featurette
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 4cd91c53d8..eb7bd843d3 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; |