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

SH-3276 Handle 416 status back from texture fetches as okay. 

A 416 will just mean there's no more data and whatever we have
is complete.
meow-7.2.2
Monty Brandenberg 2012-07-10 16:56:38 -04:00
parent 1c3af2658e
commit a5ba9c0eb3
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/lltexturefetch.cpp
View File

@ -1364,6 +1364,10 @@ bool LLTextureFetchWorker::doWork(S32 param)
}
mState = SEND_HTTP_REQ;
acquireHttpSemaphore();
// *NOTE: You must invoke releaseHttpSemaphore() if you transition
// to a state other than SEND_HTTP_REQ or WAIT_HTTP_REQ or abort
// the request.
}
if (mState == WAIT_HTTP_RESOURCE2)
@ -1486,13 +1490,16 @@ bool LLTextureFetchWorker::doWork(S32 param)
{
LL_INFOS_ONCE("Texture") << "Texture server busy (503): " << mUrl << LL_ENDL;
}
else if (http_not_sat == mGetStatus)
{
// Allowed, we'll accept whatever data we have as complete.
mHaveAllData = TRUE;
}
else
{
llinfos << "HTTP GET failed for: " << mUrl
<< " Status: " << mGetStatus.toHex()
<< " Reason: '" << mGetReason << "'"
// *FIXME: Add retry info for reporting purposes...
// << " Attempt:" << mHTTPFailCount+1 << "/" << max_attempts
<< llendl;
}
@ -1839,7 +1846,7 @@ void LLTextureFetchWorker::onCompleted(LLCore::HttpHandle handle, LLCore::HttpRe
success = false;
std::string reason(status.toString());
setGetStatus(status, reason);
llwarns << "CURL GET FAILED, status: " << status.toHex()
llwarns << "CURL GET FAILED, status: " << status.toHex()
<< " reason: " << reason << llendl;
}
else