diff options
| author | Tofu Buzzard <no-email> | 2010-11-09 10:05:17 +0000 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2010-11-09 10:05:17 +0000 |
| commit | caa53cc8cdd69bd48bd6c07fa6c98234e81f8a42 (patch) | |
| tree | 682c2571bad71cf52e5157f4703163ca2ce21f57 /indra/newview/llworld.cpp | |
| parent | 179e9e37ecbdcd1ad2133733047707ddd42e8c30 (diff) | |
| parent | b657516f72f016a918e0ff627105dd380a94394c (diff) | |
merge up from v-d
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 8731c9e1a7..8fabaaba80 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(); } |