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

SL-15152 Crashfix: Do not update environments when quiting

meow-7.2.2
Andrey Kleshchev 2021-04-21 18:27:04 +03:00 committed by Ansariel
parent a288d08792
commit 0a77c80908
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/llenvironment.cpp
View File

@ -2074,6 +2074,10 @@ void LLEnvironment::coroRequestEnvironment(S32 parcel_id, LLEnvironment::environ
{
LL_WARNS("ENVIRONMENT") << "Couldn't retrieve environment settings for " << ((parcel_id == INVALID_PARCEL_ID) ? ("region!") : ("parcel!")) << LL_ENDL;
}
else if (LLApp::isExiting())
{
return;
}
else
{
LLSD environment = result[KEY_ENVIRONMENT];
@ -2163,6 +2167,10 @@ void LLEnvironment::coroUpdateEnvironment(S32 parcel_id, S32 track_no, UpdateInf
notify = LLSD::emptyMap();
notify["FAIL_REASON"] = result["message"].asString();
}
else if (LLApp::isExiting())
{
return;
}
else
{
LLSD environment = result[KEY_ENVIRONMENT];
@ -2225,6 +2233,10 @@ void LLEnvironment::coroResetEnvironment(S32 parcel_id, S32 track_no, environmen
notify = LLSD::emptyMap();
notify["FAIL_REASON"] = result["message"].asString();
}
else if (LLApp::isExiting())
{
return;
}
else
{
LLSD environment = result[KEY_ENVIRONMENT];