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

Conflicts:
	indra/llcommon/llstring.cpp
	indra/llmessage/llcurl.cpp
	indra/newview/llviewertexturelist.cpp
	indra/newview/viewer_manifest.py
	install.xml

Resolved:
	indra/llcommon/llstring.cpp :
		two different ways to work around compile error.
	indra/llmessage/llcurl.cpp :
		this file is no longer used.. I deleted huge
		parts to mark that I implemented that. Siana
		apparently made a few changes in those parts.
	indra/newview/llviewertexturelist.cpp :
		manually copied patch. Mine also removed trailing
		spaces, keeping that.
	indra/newview/viewer_manifest.py:
		Collision with changes from Liru, which have been
		ignored (kept siana/master).
	install.xml:
		Collision with an earlier screw up. I kept the
		fix from siana/master.

indra/newview/app_settings/settings.xml

@@ -21,6 +21,19 @@
 	  <integer>1</integer>
 	</map>
 
+	<key>SianaVoidWaterSubdivision</key>
+	<map>
+	  <key>Comment</key>
+	  <string>Number of tiles of void water</string>
+	  <key>Persist</key>
+	  <integer>1</integer>
+	  <key>Type</key>
+	  <string>U32</string>
+	  <key>Value</key>
+	  <integer>8</integer>
+	</map>
+
+
   <key>SGAbsolutePointer</key>
   <map>
 	<key>Comment</key>
@@ -278,29 +291,6 @@
     </array>
   </map>
 
-	<key>SianaJ2CSizeExponent</key>
-	<map>
-		<key>Comment</key>
-		<string>Exponent of size estimator. Should be between 0.0 and 1.0</string>
-		<key>Persist</key>
-		<integer>1</integer>
-		<key>Type</key>
-		<string>F32</string>
-		<key>Value</key>
-		<real>1.0</real>
-	</map>
-	<key>SianaJ2CSizeOffset</key>
-	<map>
-		<key>Comment</key>
-		<string>Number of bytes to add to size estimator.</string>
-		<key>Persist</key>
-		<integer>1</integer>
-		<key>Type</key>
-		<string>S32</string>
-		<key>Value</key>
-		<integer>0</integer>
-	</map>
-
 	<key>SianaLegacyJ2CSize</key>
 	<map>
 		<key>Comment</key>
@@ -782,7 +772,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>1</integer>
+      <integer>0</integer>
     </map>
     <key>PrivateLookAt</key>
     <map>
@@ -2212,38 +2202,16 @@
       <key>Value</key>
 	  <string>http://www.singularityviewer.org</string>
     </map>
-    <key>BrowserCookiesEnabled</key>
+    <key>BrowserIgnoreSSLCertErrors</key>
     <map>
       <key>Comment</key>
-      <string>Enable Cookes in WebKit</string>
+      <string>FOR TESTING ONLY: Tell the built-in web browser to ignore SSL cert errors.</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-	  <integer>1</integer>
-    </map>
-    <key>BrowserPluginsEnabled</key>
-    <map>
-      <key>Comment</key>
-      <string>Enable Mozilla Plug-Ins in WebKit</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-	  <integer>1</integer>
-    </map>
-    <key>BrowserJavascriptEnabled</key>
-    <map>
-      <key>Comment</key>
-      <string>Enable JavaScript execution in WebKit</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-	  <integer>1</integer>
+      <integer>0</integer>
     </map>
     <key>PluginAttachDebuggerToPlugins</key>
     <map>
@@ -3950,6 +3918,28 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>BrowserJavascriptEnabled</key>
+    <map>
+      <key>Comment</key>
+      <string>Enable Javascript in the built-in Web browser?</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>BrowserPluginsEnabled</key>
+    <map>
+      <key>Comment</key>
+      <string>Enable Web plugins in the built-in Web browser?</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>CreateToolCopyCenters</key>
     <map>
       <key>Comment</key>
@@ -8208,6 +8198,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>MediaPluginDebugging</key>
+    <map>
+      <key>Comment</key>
+      <string>Turn on debugging messages that may help diagnosing media issues (WARNING: May reduce performance).</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>MediaControlFadeTime</key>
     <map>
       <key>Comment</key>
@@ -8272,7 +8273,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-	  <integer>0</integer>
+      <integer>0</integer>
     </map>
     <key>MemoryPrivatePoolSize</key>
     <map>
@@ -8515,7 +8516,7 @@
         <integer>29</integer>
       </array>
     </map>
-    <key>DisableWindAudio</key>
+    <key>MuteWind</key>
     <map>
       <key>Comment</key>
       <string>Disable the wind audio effect</string>