1 files changed, 4 insertions, 0 deletions

diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp
index bd8ed97..dec7ced 100644
--- a/linden/indra/newview/llviewerobjectlist.cpp
+++ b/linden/indra/newview/llviewerobjectlist.cpp
@@ -859,6 +859,10 @@ 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;        
                 }
         }