From ec51c2a4cf814686c16a1637799d7c753c4f2d9f Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 12 Jun 2009 04:10:14 -0700
Subject: Applied patch by Robin Cornelius for VWR-12686:
 LLTextureCache::writeToCache() does not cache textures smaller than
 TEXTURE_CACHE_ENTRY_SIZE

---
 linden/indra/newview/lltexturecache.cpp | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'linden')

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)
-- 
cgit v1.1