diff options
author | Xiaohong Bao <bao@lindenlab.com> | 2010-01-18 19:55:16 -0700 |
---|---|---|
committer | Xiaohong Bao <bao@lindenlab.com> | 2010-01-18 19:55:16 -0700 |
commit | a8cc535f544bb9b9941e0c45276db12d9c8e885d (patch) | |
tree | 94603d7a4d9186ea3cd66bd1d17a90025af98243 /indra | |
parent | 62ab590b166b88a80b00c0a4fde1ef87c3bf0b38 (diff) |
temporarily disable the texture fetching thread again to avoid mutex deadlocks.
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 2060df0b88..638a8f759d 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1683,7 +1683,7 @@ bool LLAppViewer::initThreads() // Image decoding LLAppViewer::sImageDecodeThread = new LLImageDecodeThread(enable_threads && true); LLAppViewer::sTextureCache = new LLTextureCache(enable_threads && true); - LLAppViewer::sTextureFetch = new LLTextureFetch(LLAppViewer::getTextureCache(), sImageDecodeThread, enable_threads && true); + LLAppViewer::sTextureFetch = new LLTextureFetch(LLAppViewer::getTextureCache(), sImageDecodeThread, enable_threads && false); LLImage::initClass(); if (LLFastTimer::sLog || LLFastTimer::sMetricLog) |