diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-17 02:06:30 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-17 02:06:30 +0000 |
| commit | c57beb8b4bd51add9a92ddc4d704e7bea9c4d940 (patch) | |
| tree | 8fc0abb0655302822390d227d9ec0ad7d4056563 /indra/newview/llworld.cpp | |
| parent | fb42741b620cea3d3b6380f1f099c92fcf4f3b04 (diff) | |
QAR-449 Viewer 1.20 RC 0
merge Branch_1-20-Viewer -r 84060 : 84432 -> release
Diffstat (limited to 'indra/newview/llworld.cpp')
| -rw-r--r-- | indra/newview/llworld.cpp | 6 |
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(); } |