From e4e01ea7cce42ca5eac28ceff2b111e52dfd939b Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Tue, 28 May 2013 17:44:50 -0600 Subject: fix for SH-4214: Crash on Linux readFromCache: ASSERT (mInitialized) --- indra/newview/llappviewer.cpp | 1 + indra/newview/llworld.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview') 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 ; -- cgit v1.2.3