summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorTofu Buzzard <no-email>2011-03-10 12:14:01 -0800
committerTofu Buzzard <no-email>2011-03-10 12:14:01 -0800
commitc1f01016cfc4dd908c1f73b815cddb1b6b35194d (patch)
treef089fd509a7829c99d904888f50ed256dc19ce34 /indra/newview/llappviewer.cpp
parent59c0059afa700661a3342a61e54164a8cf7446c3 (diff)
parent3c37aa1c19599a02d0652d78d46d55214085a832 (diff)
merge
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rwxr-xr-xindra/newview/llappviewer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index add0e72ce2..c7351177a7 100755
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1712,8 +1712,8 @@ bool LLAppViewer::cleanup()
// Delete workers first
// shotdown all worker threads before deleting them in case of co-dependencies
- sTextureCache->shutdown();
sTextureFetch->shutdown();
+ sTextureCache->shutdown();
sImageDecodeThread->shutdown();
sTextureFetch->shutDownTextureCacheThread() ;