diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 12:24:16 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 12:24:16 -0400 |
commit | 9463f10b3332d34655006f4ba5127b114ca6e0c3 (patch) | |
tree | 2e5e3226fbae28cba66e473edc09ccc9f8bd50cf /indra/newview/llviewerparcelmgr.cpp | |
parent | 7137647e90d8c11197513f542f04fb39b483d663 (diff) | |
parent | b1098308428873e927cbf3c956ed0a7f17dc439b (diff) |
Merge branch 'release/luau-scripting' into lua-timers after Maint X
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; |