diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-03-10 13:32:22 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-03-10 13:32:22 -0500 |
| commit | 250cc9c956021ce2cb8b56bae30cd01184807b7b (patch) | |
| tree | 7e02fe8d47e4af6c51fd47bd5800c3ed3b38551d /indra/newview/llappviewer.cpp | |
| parent | fb00d280403b2befd645b8a80c3d9a3183e4c02c (diff) | |
| parent | 0c02401498521f87d38778df0e795960aa5445e1 (diff) | |
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rwxr-xr-x | 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 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() ; |