diff options
| -rw-r--r-- | indra/newview/llviewerobjectlist.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
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()) { |