1 files changed, 3 insertions, 0 deletions

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;
                 }
         }