From 0a77c80908101276a9a5d2aa376ea4a717a3a1f8 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 21 Apr 2021 18:27:04 +0300
Subject: [PATCH] SL-15152 Crashfix: Do not update environments when quiting

---
 indra/newview/llenvironment.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp
index 95ec93d823..a9afd3b72d 100644
--- a/indra/newview/llenvironment.cpp
+++ b/indra/newview/llenvironment.cpp
@@ -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];