diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-03-07 18:10:42 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-03-07 18:10:42 -0700 |
| commit | da82bccd17f667a9b2506afe63e7d3da07ae00d2 (patch) | |
| tree | ad00cc1c480c5456560b009d69af3000aa5a64e3 /indra/newview/llworld.cpp | |
| parent | a07e6c625108988ad664df70a1842b53c843f223 (diff) | |
| parent | 1405bbd81ed9703cd73075ce8285c990a35e474e (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/llworld.cpp')
| -rw-r--r-- | indra/newview/llworld.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 481148ba4e..8f7197c607 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -282,7 +282,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)) ; } |