From 4687803c8e5371cab2bdf2636397b9043edf0299 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Fri, 12 Apr 2013 16:10:21 -0600 Subject: fix the crash for SH-4004: interesting: need debug option to clear viewer cache while still logged in --- indra/newview/llvocache.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/indra/newview/llvocache.cpp b/indra/newview/llvocache.cpp index 1dd149631a..f90bddcba9 100644 --- a/indra/newview/llvocache.cpp +++ b/indra/newview/llvocache.cpp @@ -593,7 +593,12 @@ void LLVOCache::removeCache(ELLPath location, bool started) void LLVOCache::removeCache() { - llassert_always(mInitialized) ; + if(!mInitialized) + { + //OK to remove cache even it is not initialized. + llwarns << "Object cache is not initialized yet." << llendl; + } + if(mReadOnly) { llwarns << "Not clearing object cache: Cache is currently in read-only mode." << llendl; -- cgit v1.2.3