diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-10-24 11:22:49 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-10-24 11:22:49 -0400 |
| commit | 96ac49c3e2c6f5253938d4fbcae722543f00aecb (patch) | |
| tree | 7caf590933840d0685b1442181f36989cfbd70b0 /indra/newview/lltexturefetch.cpp | |
| parent | 9c5becd67d7e6fe5f696dcae8690dd562b7b0449 (diff) | |
| parent | 7d63a3fa5f4aa0b7529a1404fb43e9480e9f0cdf (diff) | |
MAINT-7081: Merge from 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; |