diff options
| author | skolb <none@none> | 2009-12-03 14:33:38 -0800 |
|---|---|---|
| committer | skolb <none@none> | 2009-12-03 14:33:38 -0800 |
| commit | faa188322a72b86b6a167834a4d2cd664da112bc (patch) | |
| tree | d498ee9f8642cf17d0b4555b0ad02db42ec73bb2 /indra/newview/llappviewer.cpp | |
| parent | ec34503e0193514ffbb1ccb1249013adb0a9e320 (diff) | |
| parent | 4535fd64fbee1ee0dd3bfe54c090cfa9c56a11b6 (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 84843138bf..ddc818172d 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1668,7 +1668,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) |