livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-20504 Chat history crashes on shutdown

meow-7.2.2
Andrey Kleshchev 2023-10-19 21:32:32 +03:00 committed by akleshchev
parent 0abe8a87f3
commit c4f3bc4e95
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llimview.cpp
View File

@ -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;