diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-02-08 14:41:06 -0800 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-02-08 14:41:06 -0800 |
| commit | 12358bd95f75ab4a6166604c067d5709639c0d3c (patch) | |
| tree | 51ed7fce0f5f9c72ab3352a84b3ed40e9e6b5a1d /indra/newview/llappviewer.cpp | |
| parent | a50768669df928e19965f0c4fcc4a40d392b66ef (diff) | |
| parent | 68ea8e13aca84da898a8a067c98eb0b8327a8de4 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
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) |