From 413a42e3ef89a6394265f7ccb4531385da552eda Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com>
Date: Tue, 21 Jul 2026 17:29:58 +0300
Subject: #6014 Simplify killAllObjects

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

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

diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index f027a1eaa0..31b2108cf0 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -1379,6 +1379,7 @@ void LLViewerObjectList::killObjects(LLViewerRegion *regionp)
 
 void LLViewerObjectList::killAllObjects()
 {
+    LL_PROFILE_ZONE_SCOPED;
     // Used only on global destruction.
 
     // Mass cleanup to not clear lists one item at a time
@@ -1401,7 +1402,10 @@ void LLViewerObjectList::killAllObjects()
 
     gMeshRepo.unregisterAllMeshes();
 
-    cleanDeadObjects(false);
+    // Direct clear instead of cleanDeadObjects - all objects are already dead
+    mObjects.clear();
+    mDeadObjects.clear();
+    mNumDeadObjects = 0;
 
     if(!mObjects.empty())
     {
-- 
cgit v1.3