diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-03-15 09:10:39 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-03-15 09:10:39 -0700 |
| commit | 57ac771b154d7722e4774b40a607a11f3286f472 (patch) | |
| tree | 20a555064cedcbdd6bbea3dbeeb866f95601ba19 /indra/newview/llappviewer.cpp | |
| parent | 18ae6c639e58c4c996d4c3b2a4b34ef41deab970 (diff) | |
| parent | bc0833d5db9e887f72ea6e7a630781203ad6ad77 (diff) | |
Merge
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 2c79749894..217ff20fff 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() ; |