summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturefetch.cpp
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2012-07-06 14:58:35 -0600
committerXiaohong Bao <bao@lindenlab.com>2012-07-06 14:58:35 -0600
commit82dbdfea7056bbc7bdf7bff283abd8f2b61420c5 (patch)
treefcd35f374a2215ef1ab37493d5a2de157e27e915 /indra/newview/lltexturefetch.cpp
parent0730b24d7cb0a0ce0d6d08bc4e98387124bf03d0 (diff)
parente40d9081c6e0a69a5718d1e3ba9c7bcbffc39304 (diff)
Automated merge with https://bitbucket.org/VirLinden/drano
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
-rwxr-xr-xindra/newview/lltexturefetch.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index 42f79eb9fa..09754fc5c0 100755
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -1756,7 +1756,10 @@ S32 LLTextureFetchWorker::callbackHttpGet(const LLChannelDescriptors& channels,
// 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();
+ if(mWriteToCacheState != NOT_WRITE)
+ {
+ mUrl.clear();
+ }
mLoaded = TRUE;
setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority);