diff options
author | Eli Linden <eli@lindenlab.com> | 2010-02-08 14:57:17 -0800 |
---|---|---|
committer | Eli Linden <eli@lindenlab.com> | 2010-02-08 14:57:17 -0800 |
commit | 552ad07f338eb4dd6f72cea5fcc63747f3a212c0 (patch) | |
tree | 7838ca3f80c76de8cede5401ed5b13190db489fe /indra/newview/llappviewer.cpp | |
parent | b6229addf2419f7eebdfbd6024ddba3444fdc5ff (diff) | |
parent | 12358bd95f75ab4a6166604c067d5709639c0d3c (diff) |
merge
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-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 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) |