diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-23 10:42:35 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-23 10:42:35 +0100 |
| commit | b99c90daf38765161eafec418d52493761baf872 (patch) | |
| tree | 6d3b73ec2593e9b67120de036f9ef0c2191531ba /indra/newview/lltexturefetch.cpp | |
| parent | ce8451a2578e09c00ef53b768a5dbb3e87999d0c (diff) | |
| parent | 6837f660380d1d5ddff021e6c14273937ff11036 (diff) | |
merge
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
| -rw-r--r-- | 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 2ea6e5936d..e64696b120 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -850,6 +850,7 @@ bool LLTextureFetchWorker::doWork(S32 param) mState = WAIT_HTTP_REQ; mFetcher->addToHTTPQueue(mID); + mSentRequest = QUEUED; // Will call callbackHttpGet when curl request completes std::vector<std::string> headers; headers.push_back("Accept: image/x-j2c"); @@ -936,6 +937,11 @@ bool LLTextureFetchWorker::doWork(S32 param) { mFileSize = mBufferSize; } + else //the file size is unknown + { + mFileSize = S32_MAX ; //flag the file is not fully loaded. + } + U8* buffer = new U8[mBufferSize]; if (cur_size > 0) { |