1 files changed, 24 insertions, 12 deletions

diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp
index 4fac9bc..9b85fec 100644
--- a/linden/indra/newview/llviewerobjectlist.cpp
+++ b/linden/indra/newview/llviewerobjectlist.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -163,15 +163,20 @@ U64 LLViewerObjectList::getIndex(const U32 local_id,
 
 BOOL LLViewerObjectList::removeFromLocalIDTable(const LLViewerObject &object)
 {
-        U32 local_id = object.mLocalID;
-        LLHost region_host = object.getRegion()->getHost();
-        U32 ip = region_host.getAddress();
-        U32 port = region_host.getPort();
-        U64 ipport = (((U64)ip) << 32) | (U64)port;
-        U32 index = sIPAndPortToIndex[ipport];
+        if(object.getRegion())
+        {
+                U32 local_id = object.mLocalID;
+                LLHost region_host = object.getRegion()->getHost();
+                U32 ip = region_host.getAddress();
+                U32 port = region_host.getPort();
+                U64 ipport = (((U64)ip) << 32) | (U64)port;
+                U32 index = sIPAndPortToIndex[ipport];
+
+                U64     indexid = (((U64)index) << 32) | (U64)local_id;
+                return sIndexAndLocalIDToUUID.erase(indexid) > 0 ? TRUE : FALSE;
+        }
 
-        U64     indexid = (((U64)index) << 32) | (U64)local_id;
-        return sIndexAndLocalIDToUUID.erase(indexid) > 0 ? TRUE : FALSE;
+        return FALSE ;
 }
 
 void LLViewerObjectList::setUUIDAndLocal(const LLUUID &id,
@@ -822,8 +827,15 @@ void LLViewerObjectList::removeDrawable(LLDrawable* drawablep)
 
         for (S32 i = 0; i < drawablep->getNumFaces(); i++)
         {
-                LLViewerObject* objectp = drawablep->getFace(i)->getViewerObject();
-                mSelectPickList.erase(objectp);
+                LLFace* facep = drawablep->getFace(i) ;
+                if(facep)
+                {
+                           LLViewerObject* objectp = facep->getViewerObject();
+                           if(objectp)
+                           {
+                                           mSelectPickList.erase(objectp);
+                           }
+                }
         }
 }
 
@@ -902,7 +914,7 @@ void LLViewerObjectList::killAllObjects()
         if (!mMapObjects.empty())
         {
                 llwarns << "Some objects still on map object list!" << llendl;
-                mActiveObjects.clear();
+                mMapObjects.clear();
         }
 }