diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-03-05 11:08:30 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-03-05 11:08:30 -0800 |
| commit | 5eb5602220bf65804ddccd8ce7d455a1487fbb39 (patch) | |
| tree | 6c7440c82b1daeeca4d908cf9d163e882de76c65 /indra/newview/lltexturecache.cpp | |
| parent | 8e4aa522b2b0c71321cb90c029ca071346985b6d (diff) | |
| parent | b9a96aaeb3aaf4a5e30364ddcba5af40cceb3e83 (diff) | |
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)) { |