diff options
author | Merov Linden <merov@lindenlab.com> | 2012-05-02 10:37:51 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-05-02 10:37:51 -0700 |
commit | efd19dddd93117688afe7de24c890c5a4b30bada (patch) | |
tree | 777e9159d5ec05bcd81e53f5749cd3de2862ff21 /indra/newview | |
parent | 2c0774302b11b1be9e5a41b10c5ec518669792e3 (diff) |
SH-3126 : Improve curl byte range call, test implementation in lltexturefetch (not final)
Diffstat (limited to 'indra/newview')
-rwxr-xr-x | indra/newview/lltexturefetch.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 2e1b409fa7..6afecd7e13 100755 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -775,6 +775,7 @@ U32 LLTextureFetchWorker::calcWorkPriority() } // mWorkMutex is locked +// Merov : Change so to take into account size == 0 == max void LLTextureFetchWorker::setDesiredDiscard(S32 discard, S32 size) { bool prioritize = false; @@ -1214,6 +1215,11 @@ bool LLTextureFetchWorker::doWork(S32 param) // Will call callbackHttpGet when curl request completes std::vector<std::string> headers; headers.push_back("Accept: image/x-j2c"); + if (mRequestedSize == MAX_IMAGE_DATA_SIZE) + { + mRequestedSize = 0; + llinfos << "Merov debug : getByteRange, offset = " << offset << ", id = " << mID << llendl; + } res = mFetcher->mCurlGetRequest->getByteRange(mUrl, headers, offset, mRequestedSize, new HTTPGetResponder(mFetcher, mID, LLTimer::getTotalTime(), mRequestedSize, offset, true)); } |