Skip to content
Snippets Groups Projects
Commit 21dc4949 authored by Xiaohong Bao's avatar Xiaohong Bao
Browse files

fix for EXT-6928: Viewer crashes immediately after enabling HTTP Textures on a...

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.
parent 8154a04f
No related branches found
No related tags found
No related merge requests found
...@@ -850,6 +850,7 @@ bool LLTextureFetchWorker::doWork(S32 param) ...@@ -850,6 +850,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
mState = WAIT_HTTP_REQ; mState = WAIT_HTTP_REQ;
mFetcher->addToHTTPQueue(mID); mFetcher->addToHTTPQueue(mID);
mSentRequest = QUEUED;
// Will call callbackHttpGet when curl request completes // Will call callbackHttpGet when curl request completes
std::vector<std::string> headers; std::vector<std::string> headers;
headers.push_back("Accept: image/x-j2c"); headers.push_back("Accept: image/x-j2c");
...@@ -936,6 +937,11 @@ bool LLTextureFetchWorker::doWork(S32 param) ...@@ -936,6 +937,11 @@ bool LLTextureFetchWorker::doWork(S32 param)
{ {
mFileSize = mBufferSize; mFileSize = mBufferSize;
} }
else //the file size is unknown
{
mFileSize = mBufferSize + 1 ; //flag the file is not fully loaded.
}
U8* buffer = new U8[mBufferSize]; U8* buffer = new U8[mBufferSize];
if (cur_size > 0) if (cur_size > 0)
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment