diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-10-25 22:53:40 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-10-25 22:53:40 -0600 |
| commit | 0637fe27bc9f07208a1703349a304b27fc08a535 (patch) | |
| tree | ab32091bbca0fe17eed12e50022aad805ba8c371 /indra/newview/llappviewer.cpp | |
| parent | 67c77496248c13a9770df6823e49d6fba522df7e (diff) | |
fix for SH-2624: crash at LLPrivateMemoryPoolManager::freeMem: ASSERT (!addr)
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 152ee34bbc..97a7afb354 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2003,6 +2003,8 @@ bool LLAppViewer::initThreads() static const bool enable_threads = true; #endif + LLImage::initClass(); + LLVFSThread::initClass(enable_threads && false); LLLFSThread::initClass(enable_threads && false); @@ -2012,8 +2014,7 @@ bool LLAppViewer::initThreads() LLAppViewer::sTextureFetch = new LLTextureFetch(LLAppViewer::getTextureCache(), sImageDecodeThread, enable_threads && true, - app_metrics_qa_mode); - LLImage::initClass(); + app_metrics_qa_mode); if (LLFastTimer::sLog || LLFastTimer::sMetricLog) { |