From 388da31d1cdb08a25ad8ad522c7e977452ae33d6 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 21 Jun 2010 18:32:54 -0700
Subject: Fix for objects surviving kill region, ported from Emerald.

---
 linden/indra/newview/llviewerobjectlist.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'linden')

diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp
index bfb248b..b30c28c 100644
--- a/linden/indra/newview/llviewerobjectlist.cpp
+++ b/linden/indra/newview/llviewerobjectlist.cpp
@@ -900,6 +900,9 @@ 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