From b7ad7ccaaa4f4ea5947e844ce87c13a8899f0aa1 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 19 Oct 2023 23:54:28 +0300
Subject: SL-20506 Crash when recreating LLViewerParcelMedia

---
 indra/newview/llviewerparcelmgr.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra/newview/llviewerparcelmgr.cpp')

diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index 15accd0547..c5426c9382 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -1526,6 +1526,12 @@ void LLViewerParcelMgr::processParcelOverlay(LLMessageSystem *msg, void **user)
 // static
 void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **user)
 {
+    if (LLApp::isExiting() || gDisconnected)
+    {
+        LL_DEBUGS("ParcelMgr") << "Ignoring parcel properties, shutting down" << LL_ENDL;
+        return;
+    }
+
     S32		request_result;
     S32		sequence_id;
     BOOL	snap_selection = FALSE;
-- 
cgit v1.2.3