diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-05 20:41:11 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-05 20:41:11 +0000 |
| commit | ed8e6f65fcc6065101a5decb26be31a4bfdefe5d (patch) | |
| tree | 5d414bb2fcb74cdbc989e8285570258d0fa840e4 /indra/newview/lltexturecache.cpp | |
| parent | b43441d9024db6e2ff46e53aace14f1fb6c1bbe6 (diff) | |
| parent | 32aa06139e6fb5f2e84d3e657dfbe8961170a804 (diff) | |
viewer2 merge.
Diffstat (limited to 'indra/newview/lltexturecache.cpp')
| -rw-r--r-- | indra/newview/lltexturecache.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp index 91c303c79e..3116c8feb0 100644 --- a/indra/newview/lltexturecache.cpp +++ b/indra/newview/lltexturecache.cpp @@ -750,6 +750,7 @@ LLTextureCache::LLTextureCache(bool threaded) LLTextureCache::~LLTextureCache() { + clearDeleteList() ; } ////////////////////////////////////////////////////////////////////////////// @@ -1574,6 +1575,11 @@ bool LLTextureCache::readComplete(handle_t handle, bool abort) { worker = iter->second; complete = worker->complete(); + + if(!complete && abort) + { + abortRequest(handle, true) ; + } } if (worker && (complete || abort)) { |