Applied patch by Robin Cornelius for VWR-12686: LLTextureCache::writeToCache() does not cache textures smaller than TEXTURE_CACHE_ENTRY_SIZE

2 files changed, 14 insertions, 13 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 23a1c16..cc78998 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,10 @@
+2009-06-12  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Applied patch by Robin Cornelius for VWR-12686:
+          LLTextureCache::writeToCache() does not cache textures smaller than TEXTURE_CACHE_ENTRY_SIZE
+        
+                modified:   linden/indra/newview/lltexturecache.cpp
+
 2009-06-11  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * Moved 'Duplicate' to the Tools menu.
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
         purgeTextureFilesTimeSliced();  // purge textures from cache in a non-hiccup-way
 
 
-        if (datasize >= TEXTURE_CACHE_ENTRY_SIZE)
-        {
-                LLMutexLock lock(&mWorkersMutex);
-                llassert_always(imagesize > 0);
-                LLTextureCacheWorker* worker = new LLTextureCacheRemoteWorker(this, priority, id,
-                                                                                                                                data, datasize, 0,
-                                                                                                                                imagesize, responder);
-                handle_t handle = worker->write();
-                mWriters[handle] = worker;
-                return handle;
-        }
-        delete responder;
-        return LLWorkerThread::nullHandle();
+        LLMutexLock lock(&mWorkersMutex);
+        LLTextureCacheWorker* worker = new LLTextureCacheRemoteWorker(this, priority, id,
+                                                                                                                                          data, datasize, 0,
+                                                                                                                                          imagesize, responder);
+        handle_t handle = worker->write();
+        mWriters[handle] = worker;
+        return handle;
 }
 
 bool LLTextureCache::writeComplete(handle_t handle, bool abort)