livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXT-7032: POSSIBLE FIXED: [crashhunters] crash in libcurl background thread on windows

Xiaohong Bao 2010-06-16 14:03:56 -06:00
parent 8108de817c
commit 5c7911f1e2
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/lltexturefetch.cpp
View File

@ -596,6 +596,11 @@ bool LLTextureFetchWorker::doWork(S32 param)
return true; // abort
}
}
if(mState > CACHE_POST && !mCanUseNET && !mCanUseHTTP)
{
//nowhere to get data, abort.
return true ;
}
if (mFetcher->mDebugPause)
{
@ -784,7 +789,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
}
// don't return, fall through to next state
}
else if (mSentRequest == UNSENT)
else if (mSentRequest == UNSENT && mCanUseNET)
{
// Add this to the network queue and sit here.
// LLTextureFetch::update() will send off a request which will change our state
@ -837,6 +842,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
if (mState == SEND_HTTP_REQ)
{
if(mCanUseHTTP)
{
const S32 HTTP_QUEUE_MAX_SIZE = 8;
// *TODO: Integrate this with llviewerthrottle
@ -902,6 +908,10 @@ bool LLTextureFetchWorker::doWork(S32 param)
}
// fall through
}
else //can not use http fetch.
{
return true ; //abort
}
}
if (mState == WAIT_HTTP_REQ)