diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2012-06-01 21:50:47 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2012-06-01 21:50:47 -0400 |
| commit | 3da3b00084ed8222a49cbe834a25a49a643b591e (patch) | |
| tree | c71652c5794e775b094103a0131c20effef857e2 /indra/newview/lltexturefetch.cpp | |
| parent | fe5c1683f0e13e8a3f0523095c1c7e3a3fd17cf3 (diff) | |
| parent | 4155301015525a242a79b9b3134e66d366bc0ebd (diff) | |
Merge
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
| -rw-r--r-- | indra/newview/lltexturefetch.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 97d7ec5531..08f3ca1583 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -1255,8 +1255,7 @@ bool LLTextureFetchWorker::doWork(S32 param) { memcpy(buffer, mFormattedImage->getData(), cur_size); } - mHttpBufferArray->seek(0); - mHttpBufferArray->read((char *) buffer + cur_size, append_size); + mHttpBufferArray->read(0, (char *) buffer + cur_size, append_size); // NOTE: setData releases current data and owns new data (buffer) mFormattedImage->setData(buffer, total_size); |