From 7b376bfa40d851805b46ca5e9feadd03594cc5c9 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 15 Sep 2009 01:29:41 -0700
Subject: Fixed unhandled exception in llviewerobjectlist.cpp

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

(limited to 'linden')

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,
-- 
cgit v1.1