Backed out changeset: f2c6a8ac2edc - prep for http merge

Wed, 12 Feb 2014 14:19:12 -0800

author
Tank_Master
date
Wed, 12 Feb 2014 14:19:12 -0800
changeset 40756
0da1db68a6e7
parent 40755
2d4b7013135a
child 40757
a20f94d25c9e

Backed out changeset: f2c6a8ac2edc - 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 14:15:21 2014 -0800
     1.2 +++ b/indra/newview/app_settings/settings.xml	Wed Feb 12 14:19:12 2014 -0800
     1.3 @@ -19594,17 +19594,6 @@
     1.4        <key>Value</key>
     1.5        <string>Grey</string>
     1.6      </map>
     1.7 -  <key>FSMaxMeshRequestsPerSecond</key>
     1.8 -  <map>
     1.9 -    <key>Comment</key>
    1.10 -    <string>The maximum number of mesh requests per second.</string>
    1.11 -    <key>Persist</key>
    1.12 -    <integer>1</integer>
    1.13 -    <key>Type</key>
    1.14 -    <string>U32</string>
    1.15 -    <key>Value</key>
    1.16 -    <integer>100</integer>
    1.17 -  </map>
    1.18      <key>ExodusFlickrLastTags</key>
    1.19      <map>
    1.20        <key>Comment</key>
    1.21 @@ -20225,6 +20214,8 @@
    1.22        <integer>1</integer>
    1.23      </map>
    1.24      <!-- End: Prefs > Sound/Media => UI Sounds -->
    1.25 +=======
    1.26 +>>>>>>> other
    1.27    
    1.28      <key>FSShowVoiceVisualizer</key>
    1.29      <map>
     2.1 --- a/indra/newview/llmeshrepository.cpp	Wed Feb 12 14:15:21 2014 -0800
     2.2 +++ b/indra/newview/llmeshrepository.cpp	Wed Feb 12 14:19:12 2014 -0800
     2.3 @@ -76,8 +76,7 @@
     2.4  
     2.5  LLMeshRepository gMeshRepo;
     2.6  
     2.7 -// <FS:Ansariel> Configurable request throttle
     2.8 -//const U32 MAX_MESH_REQUESTS_PER_SECOND = 100;
     2.9 +const U32 MAX_MESH_REQUESTS_PER_SECOND = 100;
    2.10  
    2.11  // Maximum mesh version to support.  Three least significant digits are reserved for the minor version, 
    2.12  // with major version changes indicating a format change that is not backwards compatible and should not
    2.13 @@ -579,9 +578,6 @@
    2.14  		llwarns << "convex decomposition unable to be loaded" << llendl;
    2.15  	}
    2.16  
    2.17 -	// <FS:Ansariel> Configurable request throttle
    2.18 -	static LLCachedControl<U32> fsMaxMeshRequestsPerSecond(gSavedSettings, "FSMaxMeshRequestsPerSecond");
    2.19 -
    2.20  	while (!LLApp::isQuitting())
    2.21  	{
    2.22  		mWaiting = true;
    2.23 @@ -602,10 +598,7 @@
    2.24  
    2.25  			// NOTE: throttling intentionally favors LOD requests over header requests
    2.26  			
    2.27 -			// <FS:Ansariel> Configurable request throttle
    2.28 -			//while (!mLODReqQ.empty() && count < MAX_MESH_REQUESTS_PER_SECOND && sActiveLODRequests < sMaxConcurrentRequests)
    2.29 -			while (!mLODReqQ.empty() && count < (U32)fsMaxMeshRequestsPerSecond && sActiveLODRequests < sMaxConcurrentRequests)
    2.30 -			// </FS:Ansariel> Configurable request throttle
    2.31 +			while (!mLODReqQ.empty() && count < MAX_MESH_REQUESTS_PER_SECOND && sActiveLODRequests < sMaxConcurrentRequests)
    2.32  			{
    2.33  				if (mMutex)
    2.34  				{
    2.35 @@ -623,10 +616,7 @@
    2.36  				}
    2.37  			}
    2.38  
    2.39 -			// <FS:Ansariel> Configurable request throttle
    2.40 -			//while (!mHeaderReqQ.empty() && count < MAX_MESH_REQUESTS_PER_SECOND && sActiveHeaderRequests < sMaxConcurrentRequests)
    2.41 -			while (!mHeaderReqQ.empty() && count < (U32)fsMaxMeshRequestsPerSecond && sActiveHeaderRequests < sMaxConcurrentRequests)
    2.42 -			// </FS:Ansariel> Configurable request throttle
    2.43 +			while (!mHeaderReqQ.empty() && count < MAX_MESH_REQUESTS_PER_SECOND && sActiveHeaderRequests < sMaxConcurrentRequests)
    2.44  			{
    2.45  				if (mMutex)
    2.46  				{

mercurial