Merge remote branch 'thickbrick/weekly' into weekly

1 files changed, 3 insertions, 1 deletions

diff --git a/linden/indra/newview/lltexturefetch.cpp b/linden/indra/newview/lltexturefetch.cpp
index 878c2fa..ab867a6 100644
--- a/linden/indra/newview/lltexturefetch.cpp
+++ b/linden/indra/newview/lltexturefetch.cpp
@@ -664,16 +664,17 @@ bool LLTextureFetchWorker::doWork(S32 param)
                         mLoaded = FALSE;
                         setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority); // Set priority first since Responder may change it
 
-                        CacheReadResponder* responder = new CacheReadResponder(mFetcher, mID, mFormattedImage);
                         if (mUrl.compare(0, 7, "file://") == 0)
                         {
                                 // read file from local disk
                                 std::string filename = mUrl.substr(7, std::string::npos);
+                                CacheReadResponder* responder = new CacheReadResponder(mFetcher, mID, mFormattedImage);
                                 mCacheReadHandle = mFetcher->mTextureCache->readFromCache(filename, mID, cache_priority,
                                                                                                                                                   offset, size, responder);
                         }
                         else if (mUrl.empty())
                         {
+                                CacheReadResponder* responder = new CacheReadResponder(mFetcher, mID, mFormattedImage);
                                 mCacheReadHandle = mFetcher->mTextureCache->readFromCache(mID, cache_priority,
                                                                                                                                                   offset, size, responder);
                         }
@@ -723,6 +724,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
                 {
                         // we have enough data, decode it
                         llassert_always(mFormattedImage->getDataSize() > 0);
+                        mLoadedDiscard = mDesiredDiscard;
                         mState = DECODE_IMAGE;
                         mWriteToCacheState = NOT_WRITE ;
                         LL_DEBUGS("Texture") << mID << ": Cached. Bytes: " << mFormattedImage->getDataSize()