summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorRye <rye@alchemyviewer.org>2025-08-28 00:53:15 -0400
committerRye <rye@alchemyviewer.org>2025-08-28 00:53:15 -0400
commit96ff5f8e70396b53168682c4a1addb9a61d45e7c (patch)
treec874c67c68f2412c0e1cc630ffbb6bf3819c229c /indra/newview/llviewermessage.cpp
parent77d71dec863e28323bcafb1573cd1ecd54fe3049 (diff)
parentb2468342072f1e8b0fa2029d01918f74cdd6d4a8 (diff)
Merge branch 'develop' of github.com:secondlife/viewer into rye/infinitemac
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rw-r--r--indra/newview/llviewermessage.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 44831aea03..7d39cc6059 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -3669,7 +3669,7 @@ void process_kill_object(LLMessageSystem *mesgsys, void **user_data)
gObjectList.killObject(objectp);
}
- if(delete_object)
+ if(delete_object && regionp)
{
regionp->killCacheEntry(local_id);
}