From 5ea3583bed34410758b54dad5aab9dcdb550719f Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 27 Aug 2010 06:41:14 -0700
Subject: Revert "Fix for objects surviving kill region, ported from Emerald."
since it causes issues with region loading.
This reverts commit 388da31d1cdb08a25ad8ad522c7e977452ae33d6.
---
linden/indra/newview/llviewerobjectlist.cpp | 3 ---
1 file changed, 3 deletions(-)
diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp
index b30c28c..bfb248b 100644
--- a/linden/indra/newview/llviewerobjectlist.cpp
+++ b/linden/indra/newview/llviewerobjectlist.cpp
@@ -900,9 +900,6 @@ void LLViewerObjectList::killObjects(LLViewerRegion *regionp)
if (objectp->mRegionp == regionp)
{
killObject(objectp);
- // invalidate region pointer. region will become invalid, but
- // refcounted objects may survive the cleanDeadObjects() call below
- objectp->mRegionp = NULL;
}
}
--
cgit v1.1