Merge branch 'main' into marchcat/x-mf-merge

# Conflicts:
#	doc/contributions.txt
#	indra/newview/llfloaterimagepreview.cpp

1 files changed, 12 insertions, 0 deletions

diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 0eb5a2c365..187dbdd3a2 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -581,6 +581,12 @@ void chatterBoxHistoryCoro(std::string url, LLUUID sessionId, std::string from,
         return;
     }
 
+    if (LLApp::isExiting() || gDisconnected)
+    {
+        LL_DEBUGS("ChatHistory") << "Ignoring chat history response, shutting down" << LL_ENDL;
+        return;
+    }
+
     // Add history to IM session
     LLSD history = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS_CONTENT];
 
@@ -3917,6 +3923,12 @@ public:
                       const LLSD& context,
                       const LLSD& input) const
     {
+        if (LLApp::isExiting() || gDisconnected)
+        {
+            LL_DEBUGS("ChatHistory") << "Ignoring ChatterBox session, Shutting down" << LL_ENDL;
+            return;
+        }
+
         LLSD body;
         LLUUID temp_session_id;
         LLUUID session_id;