diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-03-17 23:19:39 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-03-17 23:19:39 -0700 |
| commit | bce92b3ec6d3efb4a2938f35ba7e1803b4b57145 (patch) | |
| tree | 76c0ded54ebe614d74d4ad4b577d41abc2630c3a /indra/newview/llappviewer.cpp | |
| parent | d63c1a4df14f5eaeee37b82890a445e912d60683 (diff) | |
| parent | 741de388d38290cbb946070a8380f492971dfd2e (diff) | |
Pull in merov_linden/viewer-autobuild2010
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() ; |