diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-05 17:56:19 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-05 17:56:19 +0000 |
| commit | df50590145a835531a9539a96e8349f910161f53 (patch) | |
| tree | 9fa9912f3f815d01401d7095ef28f2f8d7f0d7b7 /indra/newview/lltexturecache.cpp | |
| parent | f1a4dc710d3978a96bb05482643df0960f6e8fd4 (diff) | |
| parent | b9a96aaeb3aaf4a5e30364ddcba5af40cceb3e83 (diff) | |
merge from viewer-2-0
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)) { |