diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-10-19 21:32:32 +0300 |
|---|---|---|
| committer | akleshchev <117672381+akleshchev@users.noreply.github.com> | 2023-10-19 23:03:56 +0300 |
| commit | c4f3bc4e9523bb6fcfd2408868bf1907384a4f84 (patch) | |
| tree | dfdcaf2677f82695de236b1727c4c81fb128be4d /indra | |
| parent | 0abe8a87f37503ab633072443988f3ac3e88a097 (diff) | |
SL-20504 Chat history crashes on shutdown
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llimview.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 6880cf2171..ba0ebc6fe7 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -579,6 +579,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]; @@ -3913,6 +3919,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; |