diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-11-12 17:34:30 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-11-12 17:34:30 -0500 |
| commit | 3ea3d4cf16894c928cd60c19429dbec158185f96 (patch) | |
| tree | c6331ca9eb06764e1d8109b6d90002ee34507d04 /indra/newview/llworld.cpp | |
| parent | d9c0e0ba74d3f042ae7f3a7310f0c0bf23e6eaa9 (diff) | |
| parent | 63466f0ecae64cad8d2f74ccd1ade29121a26a95 (diff) | |
merge
Diffstat (limited to 'indra/newview/llworld.cpp')
| -rw-r--r-- | indra/newview/llworld.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 1bd3aea1e0..70997f7be6 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -126,7 +126,10 @@ void LLWorld::destroyClass() LLViewerRegion* region_to_delete = *region_it++; removeRegion(region_to_delete->getHost()); } - LLVOCache::getInstance()->destroyClass() ; + if(LLVOCache::hasInstance()) + { + LLVOCache::getInstance()->destroyClass() ; + } LLViewerPartSim::getInstance()->destroyClass(); } |