livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

meow-7.2.2
Xiaohong Bao 2013-05-28 17:44:50 -06:00
parent 6827febd30
commit e4e01ea7cc
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llappviewer.cpp
View File

@ -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();

2
indra/newview/llworld.cpp
View File

@ -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 ;