Backed out changeset: caf19078a314 - prep for http merge

Wed, 12 Feb 2014 13:53:33 -0800

author
Tank_Master
date
Wed, 12 Feb 2014 13:53:33 -0800
changeset 40753
1a146f745b7e
parent 40752
ff2fee6e8ffd
child 40754
45dd6102ba3b

Backed out changeset: caf19078a314 - 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:52:32 2014 -0800
     1.2 +++ b/indra/newview/app_settings/settings.xml	Wed Feb 12 13:53:33 2014 -0800
     1.3 @@ -12630,15 +12630,7 @@
     1.4      <key>Type</key>
     1.5      <string>U32</string>
     1.6      <key>Value</key>
     1.7 -    <integer>16</integer>
     1.8 -    <key>SanityCheckType</key>
     1.9 -    <string>LessThan</string>
    1.10 -    <key>SanityValue</key>
    1.11 -    <array>
    1.12 -      <integer>33</integer>
    1.13 -    </array>
    1.14 -    <key>SanityComment</key>
    1.15 -    <string>Setting this value too high will make it less likely that mesh objects will load correctly and cause performace degradation for you and others in the same region.</string>
    1.16 +    <integer>32</integer>
    1.17    </map>
    1.18     <key>RunMultipleThreads</key>
    1.19      <map>
     2.1 --- a/indra/newview/llmeshrepository.cpp	Wed Feb 12 13:52:32 2014 -0800
     2.2 +++ b/indra/newview/llmeshrepository.cpp	Wed Feb 12 13:53:33 2014 -0800
     2.3 @@ -100,11 +100,6 @@
     2.4  
     2.5  const U32 MAX_TEXTURE_UPLOAD_RETRIES = 5;
     2.6  
     2.7 -//<FS:TS> FIRE-11451: Cap concurrent mesh requests at a sane value
     2.8 -const U32 MESH_CONCURRENT_REQUEST_LIMIT = 64;	// upper limit
     2.9 -const U32 MESH_CONCURRENT_REQUEST_RESET = 16;	// reset to this if too high
    2.10 -//</FS:TS> FIRE-11451
    2.11 -
    2.12  static S32 dump_num = 0;
    2.13  std::string make_dump_name(std::string prefix, S32 num)
    2.14  {
    2.15 @@ -2622,12 +2617,6 @@
    2.16  	// <FS:Ansariel> Use faster LLCachedControls for frequently visited locations
    2.17  	//LLMeshRepoThread::sMaxConcurrentRequests = gSavedSettings.getU32("MeshMaxConcurrentRequests");
    2.18  	static LLCachedControl<U32> meshMaxConcurrentRequests(gSavedSettings, "MeshMaxConcurrentRequests");
    2.19 -	//<FS:TS> FIRE-11451: Cap concurrent requests at a sane value
    2.20 -	if ((U32)meshMaxConcurrentRequests > MESH_CONCURRENT_REQUEST_LIMIT)
    2.21 -	{
    2.22 -		gSavedSettings.setU32("MeshMaxConcurrentRequests",MESH_CONCURRENT_REQUEST_RESET);
    2.23 -	}
    2.24 -	//</FS:TS> FIRE-11451
    2.25  	LLMeshRepoThread::sMaxConcurrentRequests = (U32)meshMaxConcurrentRequests;
    2.26  	// </FS:Ansariel>
    2.27  

mercurial