Merge branch 'master' into curlthreading4

indra/llcrashlogger/llcrashlogger.cpp

@@ -49,6 +49,7 @@
 #include "llhttpclient.h"
 #include "llsdserialize.h"
 #include "llcurl.h"
+#include "aistatemachine.h"
 
 LLPumpIO* gServicePump;
 BOOL gBreak = false;
@@ -374,7 +375,7 @@ void LLCrashLogger::updateApplication(const std::string& message)
 {
 	gServicePump->pump();
     gServicePump->callback();
-	//FIXME: AIStateMachine::mainloop(); needs CPU cycles. Can't call it from here though, because it uses gSavedSettings which is part of newview.
+	AIStateMachine::mainloop();
 }
 
 bool LLCrashLogger::init()
@@ -382,6 +383,13 @@ bool LLCrashLogger::init()
 	// Initialize curl
 	AICurlInterface::initCurl();
 
+	AIStateMachine::setMaxCount(100);		// StateMachineMaxTime
+
+	// Start curl thread.
+	AICurlInterface::startCurlThread(64,	// CurlMaxTotalConcurrentConnections
+									 8,		// CurlConcurrentConnectionsPerHost
+									 true);	// NoVerifySSLCert
+
 	// We assume that all the logs we're looking for reside on the current drive
 	gDirUtilp->initAppDirs("SecondLife");
 

indra/llmessage/aihttptimeoutpolicy.cpp

@@ -621,7 +621,7 @@ AIHTTPTimeoutPolicyBase HTTPTimeoutPolicy_default(
 		AITP_default_maximum_curl_transaction,
 		AITP_default_maximum_total_delay);
 
-//static. Initialized here, but shortly overwritten by Debug Settings.
+//static. Initialized here, but shortly overwritten by Debug Settings (except for the crash logger, in which case these are the actual values).
 AIHTTPTimeoutPolicyBase AIHTTPTimeoutPolicy::sDebugSettingsCurlTimeout(
 		AITP_default_DNS_lookup_grace,
 		AITP_default_maximum_connect_time,

indra/newview/app_settings/settings.xml

@@ -4459,17 +4459,6 @@ This should be as low as possible, but too low may break functionality</string>
       <key>Value</key>
       <integer>16</integer>
     </map>
-    <key>CurlMaximumNumberOfHandles</key>
-    <map>
-      <key>Comment</key>
-      <string>Maximum number of handles curl can use (requires restart)</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>S32</string>
-      <key>Value</key>
-      <integer>256</integer>
-    </map>
     <key>CurlTimeoutDNSLookup</key>
     <map>
       <key>Comment</key>