aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorthickbrick2011-01-15 00:06:28 +0200
committerthickbrick2011-01-15 00:06:28 +0200
commit9f13705eb64c74184a67bb5eba24f3e8c6531e89 (patch)
tree7683b6cb4a9b90871b95d8202f93345e78d18893
parentFix #771: some small lossless textures fail to load from cache (diff)
downloadmeta-impy-9f13705eb64c74184a67bb5eba24f3e8c6531e89.zip
meta-impy-9f13705eb64c74184a67bb5eba24f3e8c6531e89.tar.gz
meta-impy-9f13705eb64c74184a67bb5eba24f3e8c6531e89.tar.bz2
meta-impy-9f13705eb64c74184a67bb5eba24f3e8c6531e89.tar.xz
Fix small potential leak of CacheReadResponder objects
Taken from V2/Henry.
-rw-r--r--linden/indra/newview/lltexturefetch.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/lltexturefetch.cpp b/linden/indra/newview/lltexturefetch.cpp
index 6ab4d24..83a54e4 100644
--- a/linden/indra/newview/lltexturefetch.cpp
+++ b/linden/indra/newview/lltexturefetch.cpp
@@ -665,16 +665,17 @@ bool LLTextureFetchWorker::doWork(S32 param)
665 mLoaded = FALSE; 665 mLoaded = FALSE;
666 setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority); // Set priority first since Responder may change it 666 setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority); // Set priority first since Responder may change it
667 667
668 CacheReadResponder* responder = new CacheReadResponder(mFetcher, mID, mFormattedImage);
669 if (mUrl.compare(0, 7, "file://") == 0) 668 if (mUrl.compare(0, 7, "file://") == 0)
670 { 669 {
671 // read file from local disk 670 // read file from local disk
672 std::string filename = mUrl.substr(7, std::string::npos); 671 std::string filename = mUrl.substr(7, std::string::npos);
672 CacheReadResponder* responder = new CacheReadResponder(mFetcher, mID, mFormattedImage);
673 mCacheReadHandle = mFetcher->mTextureCache->readFromCache(filename, mID, cache_priority, 673 mCacheReadHandle = mFetcher->mTextureCache->readFromCache(filename, mID, cache_priority,
674 offset, size, responder); 674 offset, size, responder);
675 } 675 }
676 else if (mUrl.empty()) 676 else if (mUrl.empty())
677 { 677 {
678 CacheReadResponder* responder = new CacheReadResponder(mFetcher, mID, mFormattedImage);
678 mCacheReadHandle = mFetcher->mTextureCache->readFromCache(mID, cache_priority, 679 mCacheReadHandle = mFetcher->mTextureCache->readFromCache(mID, cache_priority,
679 offset, size, responder); 680 offset, size, responder);
680 } 681 }