diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-11-08 12:57:26 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-11-08 12:57:26 -0500 |
| commit | a5e63b1dc0ce6c706de46dfea10784838e2d0257 (patch) | |
| tree | 15c7d26720fe56bfc6adf796b20af4e3a5e94110 /indra/newview/llworld.cpp | |
| parent | b3ab10923d74e64e543b15d773639a856f9989e7 (diff) | |
| parent | 124a59263184391b0b4ec418c532b7a715e9b5a3 (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(); } |