Backed out changeset: 71809445e4a8 - prep for http merge

Wed, 12 Feb 2014 17:18:03 -0800

author
Tank_Master
date
Wed, 12 Feb 2014 17:18:03 -0800
changeset 40757
a20f94d25c9e
parent 40756
0da1db68a6e7
child 40758
2a17f37517e8
child 40771
69532f5ee170

Backed out changeset: 71809445e4a8 - prep for http merge

indra/newview/llmeshrepository.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/llmeshrepository.cpp	Wed Feb 12 14:19:12 2014 -0800
     1.2 +++ b/indra/newview/llmeshrepository.cpp	Wed Feb 12 17:18:03 2014 -0800
     1.3 @@ -1940,11 +1940,7 @@
     1.4  
     1.5  	if (data_size < mRequestedBytes)
     1.6  	{
     1.7 -		// <FS:Ansariel> Also retry on 408: Request timeout (The client did
     1.8 -		//               not produce a request within the time that the server
     1.9 -		//               was prepared to wait.)
    1.10 -		//if (status == HTTP_INTERNAL_ERROR || status == HTTP_SERVICE_UNAVAILABLE)
    1.11 -		if (status == HTTP_REQUEST_TIME_OUT || status == HTTP_INTERNAL_ERROR || status == HTTP_SERVICE_UNAVAILABLE)
    1.12 +		if (status == HTTP_INTERNAL_ERROR || status == HTTP_SERVICE_UNAVAILABLE)
    1.13  		{ //timeout or service unavailable, try again
    1.14  			llwarns << "Timeout or service unavailable, retrying." << llendl;
    1.15  			LLMeshRepository::sHTTPRetryCount++;
    1.16 @@ -2008,11 +2004,7 @@
    1.17  
    1.18  	if (data_size < mRequestedBytes)
    1.19  	{
    1.20 -		// <FS:Ansariel> Also retry on 408: Request timeout (The client did
    1.21 -		//               not produce a request within the time that the server
    1.22 -		//               was prepared to wait.)
    1.23 -		//if (status == HTTP_INTERNAL_ERROR || status == HTTP_SERVICE_UNAVAILABLE)
    1.24 -		if (status == HTTP_REQUEST_TIME_OUT || status == HTTP_INTERNAL_ERROR || status == HTTP_SERVICE_UNAVAILABLE)
    1.25 +		if (status == HTTP_INTERNAL_ERROR || status == HTTP_SERVICE_UNAVAILABLE)
    1.26  		{ //timeout or service unavailable, try again
    1.27  			llwarns << "Timeout or service unavailable, retrying loadMeshSkinInfo() for " << mMeshID << llendl;
    1.28  			LLMeshRepository::sHTTPRetryCount++;
    1.29 @@ -2075,11 +2067,7 @@
    1.30  
    1.31  	if (data_size < mRequestedBytes)
    1.32  	{
    1.33 -		// <FS:Ansariel> Also retry on 408: Request timeout (The client did
    1.34 -		//               not produce a request within the time that the server
    1.35 -		//               was prepared to wait.)
    1.36 -		//if (status == HTTP_INTERNAL_ERROR || status == HTTP_SERVICE_UNAVAILABLE)
    1.37 -		if (status == HTTP_REQUEST_TIME_OUT || status == HTTP_INTERNAL_ERROR || status == HTTP_SERVICE_UNAVAILABLE)
    1.38 +		if (status == HTTP_INTERNAL_ERROR || status == HTTP_SERVICE_UNAVAILABLE)
    1.39  		{ //timeout or service unavailable, try again
    1.40  			llwarns << "Timeout or service unavailable, retrying loadMeshDecomposition() for " << mMeshID << llendl;
    1.41  			LLMeshRepository::sHTTPRetryCount++;
    1.42 @@ -2143,11 +2131,7 @@
    1.43  
    1.44  	if (data_size < mRequestedBytes)
    1.45  	{
    1.46 -		// <FS:Ansariel> Also retry on 408: Request timeout (The client did
    1.47 -		//               not produce a request within the time that the server
    1.48 -		//               was prepared to wait.)
    1.49 -		//if (status == HTTP_INTERNAL_ERROR || status == HTTP_SERVICE_UNAVAILABLE)
    1.50 -		if (status == HTTP_REQUEST_TIME_OUT || status == HTTP_INTERNAL_ERROR || status == HTTP_SERVICE_UNAVAILABLE)
    1.51 +		if (status == HTTP_INTERNAL_ERROR || status == HTTP_SERVICE_UNAVAILABLE)
    1.52  		{ //timeout or service unavailable, try again
    1.53  			llwarns << "Timeout or service unavailable, retrying loadMeshPhysicsShape() for " << mMeshID << llendl;
    1.54  			LLMeshRepository::sHTTPRetryCount++;

mercurial