diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-10-30 11:15:52 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-10-30 11:15:52 -0400 |
| commit | 7e15d6ae4a2a680c799aaf24a04ace05d8674a7d (patch) | |
| tree | 5ac7cc3b5365d694bf3358d971b6994f16069028 /indra/newview/lltexturefetch.cpp | |
| parent | f643f79f093feb6d6fe8fadbdd24fe561ef458ee (diff) | |
| parent | ead19aa22cb9cb297ca1c89e96daa85101c1158f (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer64
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
| -rw-r--r-- | indra/newview/lltexturefetch.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 84a2f1b597..8447cf893e 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -1746,7 +1746,7 @@ bool LLTextureFetchWorker::doWork(S32 param) // In case of a partial response, our offset may // not be trivially contiguous with the data we have. // Get back into alignment. - if (mHttpReplyOffset > cur_size) + if ( (mHttpReplyOffset > cur_size) || (cur_size > mHttpReplyOffset + append_size)) { LL_WARNS(LOG_TXT) << "Partial HTTP response produces break in image data for texture " << mID << ". Aborting load." << LL_ENDL; |