diff options
author | Don Kjer <don@lindenlab.com> | 2011-03-14 20:18:09 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2011-03-14 20:18:09 +0000 |
commit | 6258f8d2e263e586b58d655bb32804f9079ace1d (patch) | |
tree | 9294cfe1cea68b16fbd67bc731379cb0ba921263 /indra/newview/llworld.cpp | |
parent | 5a14e3979cd52387e66a4c594e844c13f513e509 (diff) | |
parent | b7635b6112b7c7fd448aa4400bba2edbf15a5b0a (diff) |
Merge with 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 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)) ; } |