diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-24 07:48:06 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-24 07:48:06 -0400 |
| commit | 4386bb173b17ca499e0c63809b8c7227da3f0e1c (patch) | |
| tree | 7893d4c6d3eccfaf0839d48618b32de5628cd218 /indra/newview/llworld.cpp | |
| parent | eef9b265b951337d0633d18186dad2b734b30d5a (diff) | |
| parent | 1c375a8c880354432da2b218c321ed708497e161 (diff) | |
merge changes for storm-1018
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)) ; } |