2 files changed, 9 insertions, 0 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index f973236..29c5066 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -14,6 +14,11 @@
          
                 modified:   linden/indra/newview/app_settings/settings.xml
                 modified:   linden/indra/newview/lltoolpie.cpp
+                
+                
+     * Fixed unhandled exception in llviewerobjectlist.cpp
+         
+                modified:   linden/indra/newview/llviewerobjectlist.cpp
 
          
 2009-09-13  McCabe Maxsted  <hakushakukun@gmail.com>
diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp
index 78c1730..cf37058 100644
--- a/linden/indra/newview/llviewerobjectlist.cpp
+++ b/linden/indra/newview/llviewerobjectlist.cpp
@@ -165,6 +165,8 @@ U64 LLViewerObjectList::getIndex(const U32 local_id,
 
 BOOL LLViewerObjectList::removeFromLocalIDTable(const LLViewerObject &object)
 {
+        if (object.mRegionp)
+        {
                 U32 local_id = object.mLocalID;
                 LLHost region_host = object.getRegion()->getHost();
                 U32 ip = region_host.getAddress();
@@ -175,6 +177,8 @@ BOOL LLViewerObjectList::removeFromLocalIDTable(const LLViewerObject &object)
                 U64     indexid = (((U64)index) << 32) | (U64)local_id;
                 return sIndexAndLocalIDToUUID.erase(indexid) > 0 ? TRUE : FALSE;
         }
+        return FALSE;
+}
 
 void LLViewerObjectList::setUUIDAndLocal(const LLUUID &id,
                                                                                   const U32 local_id,