diff options
Diffstat (limited to 'linden')
-rw-r--r-- | linden/indra/newview/lltexturecache.cpp | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/linden/indra/newview/lltexturecache.cpp b/linden/indra/newview/lltexturecache.cpp index ec5cf78..94a5372 100644 --- a/linden/indra/newview/lltexturecache.cpp +++ b/linden/indra/newview/lltexturecache.cpp | |||
@@ -1527,19 +1527,13 @@ LLTextureCache::handle_t LLTextureCache::writeToCache(const LLUUID& id, U32 prio | |||
1527 | purgeTextureFilesTimeSliced(); // purge textures from cache in a non-hiccup-way | 1527 | purgeTextureFilesTimeSliced(); // purge textures from cache in a non-hiccup-way |
1528 | 1528 | ||
1529 | 1529 | ||
1530 | if (datasize >= TEXTURE_CACHE_ENTRY_SIZE) | 1530 | LLMutexLock lock(&mWorkersMutex); |
1531 | { | 1531 | LLTextureCacheWorker* worker = new LLTextureCacheRemoteWorker(this, priority, id, |
1532 | LLMutexLock lock(&mWorkersMutex); | 1532 | data, datasize, 0, |
1533 | llassert_always(imagesize > 0); | 1533 | imagesize, responder); |
1534 | LLTextureCacheWorker* worker = new LLTextureCacheRemoteWorker(this, priority, id, | 1534 | handle_t handle = worker->write(); |
1535 | data, datasize, 0, | 1535 | mWriters[handle] = worker; |
1536 | imagesize, responder); | 1536 | return handle; |
1537 | handle_t handle = worker->write(); | ||
1538 | mWriters[handle] = worker; | ||
1539 | return handle; | ||
1540 | } | ||
1541 | delete responder; | ||
1542 | return LLWorkerThread::nullHandle(); | ||
1543 | } | 1537 | } |
1544 | 1538 | ||
1545 | bool LLTextureCache::writeComplete(handle_t handle, bool abort) | 1539 | bool LLTextureCache::writeComplete(handle_t handle, bool abort) |