summaryrefslogtreecommitdiff
path: root/indra/newview/llworld.cpp
diff options
context:
space:
mode:
authorDave SIMmONs <simon@lindenlab.com>2011-03-15 09:10:39 -0700
committerDave SIMmONs <simon@lindenlab.com>2011-03-15 09:10:39 -0700
commit57ac771b154d7722e4774b40a607a11f3286f472 (patch)
tree20a555064cedcbdd6bbea3dbeeb866f95601ba19 /indra/newview/llworld.cpp
parent18ae6c639e58c4c996d4c3b2a4b34ef41deab970 (diff)
parentbc0833d5db9e887f72ea6e7a630781203ad6ad77 (diff)
Merge
Diffstat (limited to 'indra/newview/llworld.cpp')
-rw-r--r--indra/newview/llworld.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index c09cafc1eb..c6f9b6f6e4 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -277,7 +277,9 @@ void LLWorld::removeRegion(const LLHost &host)
updateWaterObjects();
- llassert_always(!gObjectList.hasMapObjectInRegion(regionp)) ;
+ //double check all objects of this region are removed.
+ gObjectList.clearAllMapObjectsInRegion(regionp) ;
+ //llassert_always(!gObjectList.hasMapObjectInRegion(regionp)) ;
}