Backed out changeset: 44c45a66bdaf - prep for http merge

Wed, 12 Feb 2014 13:40:30 -0800

author
Tank_Master
date
Wed, 12 Feb 2014 13:40:30 -0800
changeset 40751
0f89023606a9
parent 40604
d06b3213bc9d
child 40752
ff2fee6e8ffd

Backed out changeset: 44c45a66bdaf - 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 11:47:35 2014 -0800
     1.2 +++ b/indra/newview/app_settings/settings.xml	Wed Feb 12 13:40:30 2014 -0800
     1.3 @@ -19622,7 +19622,7 @@
     1.4      <key>Type</key>
     1.5      <string>S32</string>
     1.6      <key>Value</key>
     1.7 -    <real>150</real>
     1.8 +    <real>60</real>
     1.9    </map>
    1.10      <key>ExodusFlickrLastTags</key>
    1.11      <map>
     2.1 --- a/indra/newview/llmeshrepository.cpp	Wed Feb 12 11:47:35 2014 -0800
     2.2 +++ b/indra/newview/llmeshrepository.cpp	Wed Feb 12 13:40:30 2014 -0800
     2.3 @@ -607,7 +607,7 @@
     2.4  				count = 0;	
     2.5  
     2.6  				// <FS:Ansariel> Mesh header/LOD retry functionality
     2.7 -				F32 curl_timeout = llmax((F32)fsMeshRequestTimeout, 150.f) + 2.f; // 150 secs minimum timeout as defined in LLCurl.cpp (30s connect, 120s operation)
     2.8 +				F32 curl_timeout = llmax((F32)fsMeshRequestTimeout, 30.f) + 2.f; // 30 secs minimum timeout as defined in LLCurl.cpp
     2.9  
    2.10  				if (mMutex)
    2.11  				{

mercurial