diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-15 09:26:58 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-15 09:26:58 -0400 |
| commit | 6faa6236f520fd1dbbbbe030957a6354f5c45db3 (patch) | |
| tree | 907614751c28c888ae7f5ea725a681b34b2f48f0 /indra/newview/llappviewer.cpp | |
| parent | 174b537953b5a39702c833ab1e83313a80e5e549 (diff) | |
| parent | ae3e97024ec60d2c0555bf01ff6e2786232b6dd5 (diff) | |
merge changes for storm-28
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 a23f809b71..327a5ad698 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() ; |