Backed out changeset: 1765aceeba59 - prep for http merge

Wed, 12 Feb 2014 13:55:07 -0800

author
Tank_Master
date
Wed, 12 Feb 2014 13:55:07 -0800
changeset 40754
45dd6102ba3b
parent 40753
1a146f745b7e
child 40755
2d4b7013135a

Backed out changeset: 1765aceeba59 - prep for http merge

indra/newview/app_settings/settings.xml file | annotate | diff | revisions
indra/newview/llmeshrepository.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/app_settings/settings.xml	Wed Feb 12 13:53:33 2014 -0800
     1.2 +++ b/indra/newview/app_settings/settings.xml	Wed Feb 12 13:55:07 2014 -0800
     1.3 @@ -19608,13 +19608,13 @@
     1.4    <key>FSMeshRequestTimeout</key>
     1.5    <map>
     1.6      <key>Comment</key>
     1.7 -    <string>The timeout in seconds for a mesh request to complete before it will be issued again.</string>
     1.8 -    <key>Persist</key>
     1.9 -    <integer>1</integer>
    1.10 -    <key>Type</key>
    1.11 -    <string>S32</string>
    1.12 -    <key>Value</key>
    1.13 -    <real>60</real>
    1.14 +    <string>The timeout in seconds for a mesh header or LOD data request after that the request will be sent again.</string>
    1.15 +    <key>Persist</key>
    1.16 +    <integer>1</integer>
    1.17 +    <key>Type</key>
    1.18 +    <string>F32</string>
    1.19 +    <key>Value</key>
    1.20 +    <real>35.0</real>
    1.21    </map>
    1.22      <key>ExodusFlickrLastTags</key>
    1.23      <map>
     2.1 --- a/indra/newview/llmeshrepository.cpp	Wed Feb 12 13:53:33 2014 -0800
     2.2 +++ b/indra/newview/llmeshrepository.cpp	Wed Feb 12 13:55:07 2014 -0800
     2.3 @@ -582,7 +582,7 @@
     2.4  	// <FS:Ansariel> Configurable request throttle
     2.5  	static LLCachedControl<U32> fsMaxMeshRequestsPerSecond(gSavedSettings, "FSMaxMeshRequestsPerSecond");
     2.6  	// <FS:Ansariel> Mesh header/LOD retry functionality
     2.7 -	static LLCachedControl<S32> fsMeshRequestTimeout(gSavedSettings, "FSMeshRequestTimeout");
     2.8 +	static LLCachedControl<F32> fsMeshRequestTimeout(gSavedSettings, "FSMeshRequestTimeout");
     2.9  
    2.10  	while (!LLApp::isQuitting())
    2.11  	{
    2.12 @@ -602,7 +602,7 @@
    2.13  				count = 0;	
    2.14  
    2.15  				// <FS:Ansariel> Mesh header/LOD retry functionality
    2.16 -				F32 curl_timeout = llmax((F32)fsMeshRequestTimeout, 30.f) + 2.f; // 30 secs minimum timeout as defined in LLCurl.cpp
    2.17 +				F32 curl_timeout = (F32)fsMeshRequestTimeout;
    2.18  
    2.19  				if (mMutex)
    2.20  				{
    2.21 @@ -899,12 +899,8 @@
    2.22  			std::string http_url = constructUrl(mesh_id);
    2.23  			if (!http_url.empty())
    2.24  			{				
    2.25 -				// <FS:Ansariel> Customizable mesh request timeout
    2.26 -				//ret = mCurlRequest->getByteRange(http_url, headers, offset, size,
    2.27 -				//								 new LLMeshSkinInfoResponder(mesh_id, offset, size));
    2.28  				ret = mCurlRequest->getByteRange(http_url, headers, offset, size,
    2.29 -												 new LLMeshSkinInfoResponder(mesh_id, offset, size), gSavedSettings.getS32("FSMeshRequestTimeout"));
    2.30 -				// </FS:Ansariel>
    2.31 +												 new LLMeshSkinInfoResponder(mesh_id, offset, size));
    2.32  				if(ret)
    2.33  				{
    2.34  					LLMeshRepository::sHTTPRequestCount++;
    2.35 @@ -985,12 +981,8 @@
    2.36  			std::string http_url = constructUrl(mesh_id);
    2.37  			if (!http_url.empty())
    2.38  			{				
    2.39 -				// <FS:Ansariel> Customizable mesh request timeout
    2.40 -				//ret = mCurlRequest->getByteRange(http_url, headers, offset, size,
    2.41 -				//								 new LLMeshDecompositionResponder(mesh_id, offset, size));
    2.42  				ret = mCurlRequest->getByteRange(http_url, headers, offset, size,
    2.43 -												 new LLMeshDecompositionResponder(mesh_id, offset, size), gSavedSettings.getS32("FSMeshRequestTimeout"));
    2.44 -				// </FS:Ansariel>
    2.45 +												 new LLMeshDecompositionResponder(mesh_id, offset, size));
    2.46  				if(ret)
    2.47  				{
    2.48  					LLMeshRepository::sHTTPRequestCount++;
    2.49 @@ -1070,12 +1062,8 @@
    2.50  			std::string http_url = constructUrl(mesh_id);
    2.51  			if (!http_url.empty())
    2.52  			{				
    2.53 -				// <FS:Ansariel> Customizable mesh request timeout
    2.54 -				//ret = mCurlRequest->getByteRange(http_url, headers, offset, size,
    2.55 -				//								 new LLMeshPhysicsShapeResponder(mesh_id, offset, size));
    2.56  				ret = mCurlRequest->getByteRange(http_url, headers, offset, size,
    2.57 -												 new LLMeshPhysicsShapeResponder(mesh_id, offset, size), gSavedSettings.getS32("FSMeshRequestTimeout"));
    2.58 -				// </FS:Ansariel>
    2.59 +												 new LLMeshPhysicsShapeResponder(mesh_id, offset, size));
    2.60  
    2.61  				if(ret)
    2.62  				{
    2.63 @@ -1242,12 +1230,8 @@
    2.64  			std::string http_url = constructUrl(mesh_id);
    2.65  			if (!http_url.empty())
    2.66  			{				
    2.67 -				// <FS:Ansariel> Customizable mesh request timeout
    2.68 -				//retval = mCurlRequest->getByteRange(constructUrl(mesh_id), headers, offset, size,
    2.69 -				//						   new LLMeshLODResponder(mesh_params, lod, offset, size));
    2.70  				retval = mCurlRequest->getByteRange(constructUrl(mesh_id), headers, offset, size,
    2.71 -										   new LLMeshLODResponder(mesh_params, lod, offset, size), gSavedSettings.getS32("FSMeshRequestTimeout"));
    2.72 -				// </FS:Ansariel>
    2.73 +										   new LLMeshLODResponder(mesh_params, lod, offset, size));
    2.74  
    2.75  				if(retval)
    2.76  				{

mercurial