diff options
| author | Jacek Antonelli | 2009-09-25 22:15:49 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-25 22:15:49 -0500 |
| commit | 5ff1687542240fe9b00d4c217b764770fc369c06 (patch) | |
| tree | bc5a1dbc882c19120ca00efb9914d70059cd79cb /linden/indra/newview/llworld.cpp | |
| parent | Merge remote branch 'mccabe/1.2.0-next' into next (diff) | |
| parent | Removed grid stuff from World Map (for now). (diff) | |
| download | meta-impy-5ff1687542240fe9b00d4c217b764770fc369c06.zip meta-impy-5ff1687542240fe9b00d4c217b764770fc369c06.tar.gz meta-impy-5ff1687542240fe9b00d4c217b764770fc369c06.tar.bz2 meta-impy-5ff1687542240fe9b00d4c217b764770fc369c06.tar.xz | |
Merge branch 'gridmanager' into next
Diffstat (limited to 'linden/indra/newview/llworld.cpp')
| -rw-r--r-- | linden/indra/newview/llworld.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/newview/llworld.cpp b/linden/indra/newview/llworld.cpp index 9ee789a..4c02191 100644 --- a/linden/indra/newview/llworld.cpp +++ b/linden/indra/newview/llworld.cpp | |||
| @@ -117,6 +117,7 @@ LLWorld::LLWorld() : | |||
| 117 | 117 | ||
| 118 | void LLWorld::destroyClass() | 118 | void LLWorld::destroyClass() |
| 119 | { | 119 | { |
| 120 | mHoleWaterObjects.clear(); | ||
| 120 | gObjectList.destroy(); | 121 | gObjectList.destroy(); |
| 121 | for(region_list_t::iterator region_it = mRegionList.begin(); region_it != mRegionList.end(); ) | 122 | for(region_list_t::iterator region_it = mRegionList.begin(); region_it != mRegionList.end(); ) |
| 122 | { | 123 | { |