Skip to content
Snippets Groups Projects
Commit e4e01ea7 authored by Xiaohong Bao's avatar Xiaohong Bao
Browse files

fix for SH-4214: Crash on Linux readFromCache: ASSERT (mInitialized)

parent 6827febd
No related branches found
No related tags found
No related merge requests found
...@@ -4974,6 +4974,7 @@ void LLAppViewer::disconnectViewer() ...@@ -4974,6 +4974,7 @@ void LLAppViewer::disconnectViewer()
{ {
LLWorld::getInstance()->destroyClass(); LLWorld::getInstance()->destroyClass();
} }
LLVOCache::deleteSingleton();
// call all self-registered classes // call all self-registered classes
LLDestroyClassList::instance().fireCallbacks(); LLDestroyClassList::instance().fireCallbacks();
......
...@@ -123,7 +123,7 @@ void LLWorld::destroyClass() ...@@ -123,7 +123,7 @@ void LLWorld::destroyClass()
LLViewerRegion* region_to_delete = *region_it++; LLViewerRegion* region_to_delete = *region_it++;
removeRegion(region_to_delete->getHost()); removeRegion(region_to_delete->getHost());
} }
LLVOCache::deleteSingleton();
LLViewerPartSim::getInstance()->destroyClass(); LLViewerPartSim::getInstance()->destroyClass();
mDefaultWaterTexturep = NULL ; mDefaultWaterTexturep = NULL ;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment