diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-04-22 14:28:01 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-04-22 14:28:01 -0600 |
| commit | 4f205a93edaff3124e2501947b1bc17a9fc8fd21 (patch) | |
| tree | f61b52b2fa266bb1aa580786307f6ec13977e7f1 | |
| parent | 437d23710f8838bb43999b97e5cd423c0eca3c43 (diff) | |
| parent | 1eebca1431962927a91ef4431092cd58b4ed3576 (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
| -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..bcda51b500 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) { |