diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 09:15:57 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 09:15:57 -0400 |
| commit | 6fcc9a0eae892a8bfc1079e100a37da7f781330b (patch) | |
| tree | d8c5cb3ab9aaf52cf4ffa2bed92ff66d465fa2b4 /indra/newview/llviewerparcelmgr.cpp | |
| parent | c3da5bb12d1c7c173929433589a4068555791bea (diff) | |
| parent | bb3c36f5cbc0c3b542045fd27255eee24e03da22 (diff) | |
Merge branch 'main' into release/luau-scripting for Maint X release.
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index 149595106d..17c0d00e79 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; |