aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltexturefetch.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-06-12 14:40:11 -0700
committerJacek Antonelli2010-06-19 02:43:36 -0500
commit2427d8a7ee01c78c11415745187bdc5317677a51 (patch)
tree576ef16bdf0be19097a28abbddb97cf45be32b45 /linden/indra/newview/lltexturefetch.cpp
parentApplied patch by Thickbrick Sleaford for SNOW-712: HTTP-fetched textures are ... (diff)
downloadmeta-impy-2427d8a7ee01c78c11415745187bdc5317677a51.zip
meta-impy-2427d8a7ee01c78c11415745187bdc5317677a51.tar.gz
meta-impy-2427d8a7ee01c78c11415745187bdc5317677a51.tar.bz2
meta-impy-2427d8a7ee01c78c11415745187bdc5317677a51.tar.xz
Applied fixed patch for SNOW-712
Diffstat (limited to 'linden/indra/newview/lltexturefetch.cpp')
-rw-r--r--linden/indra/newview/lltexturefetch.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/lltexturefetch.cpp b/linden/indra/newview/lltexturefetch.cpp
index 310eeda..ebb0ee4 100644
--- a/linden/indra/newview/lltexturefetch.cpp
+++ b/linden/indra/newview/lltexturefetch.cpp
@@ -1210,7 +1210,7 @@ void LLTextureFetchWorker::callbackHttpGet(const LLChannelDescriptors& channels,
1210 buffer->readAfter(channels.in(), NULL, mBuffer, data_size); 1210 buffer->readAfter(channels.in(), NULL, mBuffer, data_size);
1211 mBufferSize += data_size; 1211 mBufferSize += data_size;
1212 if (data_size < mRequestedSize && 1212 if (data_size < mRequestedSize &&
1213 (mRequestedDiscard == MAX_DISCARD_LEVEL || mRequestedSize >= MAX_IMAGE_DATA_SIZE) ) 1213 (mRequestedDiscard == 0 || mRequestedSize >= MAX_IMAGE_DATA_SIZE) )
1214 { 1214 {
1215 // We requested whole image (by discard or by size,) so assume we got it 1215 // We requested whole image (by discard or by size,) so assume we got it
1216 mHaveAllData = TRUE; 1216 mHaveAllData = TRUE;