summaryrefslogtreecommitdiff
path: root/indra/newview/llworld.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llworld.cpp')
-rw-r--r--indra/newview/llworld.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index ca947bed97..e45b929b6f 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -118,7 +118,11 @@ LLWorld::LLWorld()
void LLWorld::destroyClass()
{
gObjectList.destroy();
- for_each(mRegionList.begin(), mRegionList.end(), DeletePointer());
+ for(region_list_t::iterator region_it = mRegionList.begin(); region_it != mRegionList.end(); )
+ {
+ LLViewerRegion* region_to_delete = *region_it++;
+ removeRegion(region_to_delete->getHost());
+ }
LLViewerPartSim::getInstance()->destroyClass();
}