diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-01-15 15:37:47 -0800 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-01-15 15:37:47 -0800 |
| commit | 5a672bbcb9032caf8b6788fef1c03f63d3646957 (patch) | |
| tree | 072278b8fd17e9ddd7f452e26769980b2b7482bb /indra/newview/llappviewer.cpp | |
| parent | ad9dfb52ac6cb38ad66fce7ed421b37284c1ea10 (diff) | |
| parent | 9d7ad2733e1a41a573b0cf6c9a272f6f696f189c (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 067369d54d..4a61096ad8 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1676,7 +1676,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) |