summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2010-02-08 14:40:06 -0800
committerXiaohong Bao <bao@lindenlab.com>2010-02-08 14:40:06 -0800
commit68ea8e13aca84da898a8a067c98eb0b8327a8de4 (patch)
treef76d34387fb292df48d7092b8e4d6d6806114b94 /indra/newview/llappviewer.cpp
parentac59a7c130f3fcbbb8f228bdf69c44ffa09f07a2 (diff)
partial fix for EXT-4352. fixed mutex deadlocks and turned on the multi-threaded texture fetching.
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 98ec907886..5349ccabec 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1679,7 +1679,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 && false);
+ LLAppViewer::sTextureFetch = new LLTextureFetch(LLAppViewer::getTextureCache(), sImageDecodeThread, enable_threads && true);
LLImage::initClass();
if (LLFastTimer::sLog || LLFastTimer::sMetricLog)