diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-05-28 17:44:50 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-05-28 17:44:50 -0600 |
| commit | e4e01ea7cce42ca5eac28ceff2b111e52dfd939b (patch) | |
| tree | cc04debc41e5484b96d8fedc59c03cc082b12d4d | |
| parent | 6827febd3027decb1bd8da013b6af413114239a9 (diff) | |
fix for SH-4214: Crash on Linux readFromCache: ASSERT (mInitialized)
| -rw-r--r-- | indra/newview/llappviewer.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llworld.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index cd881208ab..d36c33cdd7 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -4974,6 +4974,7 @@ void LLAppViewer::disconnectViewer() { LLWorld::getInstance()->destroyClass(); } + LLVOCache::deleteSingleton(); // call all self-registered classes LLDestroyClassList::instance().fireCallbacks(); diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 9603849b10..367abcb40e 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -123,7 +123,7 @@ void LLWorld::destroyClass() LLViewerRegion* region_to_delete = *region_it++; removeRegion(region_to_delete->getHost()); } - LLVOCache::deleteSingleton(); + LLViewerPartSim::getInstance()->destroyClass(); mDefaultWaterTexturep = NULL ; |