Commits

Monty Brandenberg committed a652483

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.

  • Participants
  • Parent commits 10a3bd3

Comments (0)

Files changed (1)

indra/newview/lltexturefetch.cpp

 		}
 		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)
 				{
 					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;
 				}
 
 		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