diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-23 10:50:20 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-23 10:50:20 +0100 |
| commit | a30e6f0ad04741600c4202304e6dfacaba60099b (patch) | |
| tree | d3653f285904760e9468a0a5163e2ec72e743e49 | |
| parent | 0b03cde790d54b5ebc41ee5dafa999eedde91a90 (diff) | |
Backed out changeset 4627863f43d5
back-out this backout. change made in viewer-trunk, reverted in viewer-hotfix, but we want it preserved post-merge.
| -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..aea94fd720 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 = mBufferSize + 1 ; //flag the file is not fully loaded. + } + U8* buffer = new U8[mBufferSize]; if (cur_size > 0) { |