diff options
| author | Don Kjer <don@lindenlab.com> | 2011-03-14 20:18:09 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-03-14 20:18:09 +0000 |
| commit | 6258f8d2e263e586b58d655bb32804f9079ace1d (patch) | |
| tree | 9294cfe1cea68b16fbd67bc731379cb0ba921263 /indra/newview/llappviewer.cpp | |
| parent | 5a14e3979cd52387e66a4c594e844c13f513e509 (diff) | |
| parent | b7635b6112b7c7fd448aa4400bba2edbf15a5b0a (diff) | |
Merge with viewer-development
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 d0e1a454fa..10b222751b 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1677,8 +1677,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() ; |