2 files changed, 16 insertions, 1 deletions

diff --git a/linden/indra/newview/lltexturecache.cpp b/linden/indra/newview/lltexturecache.cpp
index 3cedf73..c5c14b5 100644
--- a/linden/indra/newview/lltexturecache.cpp
+++ b/linden/indra/newview/lltexturecache.cpp
@@ -1063,6 +1063,13 @@ void LLTextureCache::writeEntryAndClose(S32 idx, Entry& entry)
                 if (!mReadOnly)
                 {
                         entry.mTime = time(NULL);
+                        if(entry.mImageSize < entry.mBodySize)
+                        {
+                                // Just say no, due to my messing around to cache discards other than 0 we can end up here
+                                // after recalling an image from cache at a lower discard than cached. RC
+                                return;
+                        }
+
                         llassert_always(entry.mImageSize == 0 || entry.mImageSize == -1 || entry.mImageSize > entry.mBodySize);
                         if (entry.mBodySize > 0)
                         {
diff --git a/linden/indra/newview/lltexturefetch.cpp b/linden/indra/newview/lltexturefetch.cpp
index c9d8369..2184478 100644
--- a/linden/indra/newview/lltexturefetch.cpp
+++ b/linden/indra/newview/lltexturefetch.cpp
@@ -1142,7 +1142,15 @@ bool LLTextureFetchWorker::doWork(S32 param)
                 else
                 {
                         setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority);
-                        return true;
+
+                        if(mDecodedDiscard<=0)
+                        {
+                                return true;
+                        }
+                        else
+                        {
+                                return false;
+                        }
                 }
         }