diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-04-22 13:21:40 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-04-22 13:21:40 -0600 |
| commit | 0b03cde790d54b5ebc41ee5dafa999eedde91a90 (patch) | |
| tree | 71c7e512761d459b33c49695e4adaa41bd673077 | |
| parent | 38dbdeccfb999f21b12bbc9990bb5e4f31d8b325 (diff) | |
revert -r d7a43c972af0: fix for EXT-6928: Viewer crashes immediately after enabling HTTP Textures on a http-texture-server-1 simulator
and EXT-7009: textures fetched through http are never cached.
This will be checked into viewer-trunk.
| -rw-r--r-- | indra/newview/lltexturefetch.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index aea94fd720..2ea6e5936d 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -850,7 +850,6 @@ 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"); @@ -937,11 +936,6 @@ 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) { |