summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-05-17 14:48:45 -0700
committerMerov Linden <merov@lindenlab.com>2012-05-17 14:48:45 -0700
commitbfb02fa872805ab748d96389ca22cb0d05546161 (patch)
tree44eb1efac1b4410abfcbcbc07e761c6897d5a3a3 /indra/newview
parenta4eb314b76f7dfb490bed1868eed8af2315c48c8 (diff)
SH-3134 : Fix the http callback clearing the url so that further requests will look at the local cache first
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/lltexturefetch.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index 8ac6acf877..d5ecda1e61 100755
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -1739,6 +1739,10 @@ S32 LLTextureFetchWorker::callbackHttpGet(const LLChannelDescriptors& channels,
{
mRequestedSize = -1; // error
}
+ // Clear the url since we're done with the fetch
+ // Note: mUrl is used to check is fetching is required so failure to clear it will force an http fetch
+ // next time the texture is requested, even if the data have already been fetched.
+ mUrl.clear();
mLoaded = TRUE;
setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority);