Merge remote-tracking branch 'singu/master' into curlthreading2

Conflicts:
	indra/llmessage/llcurl.cpp

Changes to unused file (I'll remove it when I'm done).

indra/newview/app_settings/settings.xml

@@ -8,6 +8,31 @@
 		<string>settings_sh.xml</string>
 		<string>settings_rlv.xml</string>
 	</array>
+
+	<key>SGShiftCrouchToggle</key>
+	<map>
+	  <key>Comment</key>
+	  <string>Allow crouch toggle by holding shift</string>
+	  <key>Persist</key>
+	  <integer>1</integer>
+	  <key>Type</key>
+	  <string>Boolean</string>
+	  <key>Value</key>
+	  <integer>1</integer>
+	</map>
+
+	<key>SGServerVersionChangedNotification</key>
+	<map>
+	  <key>Comment</key>
+	  <string>Notify when going to a simulator of different version</string>
+	  <key>Persist</key>
+	  <integer>1</integer>
+	  <key>Type</key>
+	  <string>Boolean</string>
+	  <key>Value</key>
+	  <integer>0</integer>
+	</map>
+
 	<key>SianaRenderDeferredInvisiprim</key>
 	<map>
 	  <key>Comment</key>
@@ -905,6 +930,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>AntiSpamEnabled</key>
+    <map>
+      <key>Comment</key>
+      <string>When false, antispam, not relating to dialog blocking, will be turned off.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>AntiSpamFriendshipOffers</key>
     <map>
       <key>Comment</key>
@@ -1035,7 +1071,7 @@
         <key>Type</key>
         <string>U32</string>
         <key>Value</key>
-        <integer>20</integer>
+        <integer>100</integer>
     </map>
         <key>_NACL_AntiSpamNewlines</key>
         <map>
@@ -1057,7 +1093,7 @@
         <key>Type</key>
         <string>U32</string>
         <key>Value</key>
-        <integer>20</integer>
+        <integer>100</integer>
     </map>
     <!-- Vanilla SL settings that are now optionally Account-Specific -->
     <key>AgentChatColor</key>
@@ -11962,7 +11998,7 @@
     <key>Type</key>
     <string>U32</string>
     <key>Value</key>
-    <integer>32</integer>
+    <integer>128</integer>
   </map>
   <key>RunBtnState</key>
   <map>