Merge branch 'AltCompilers' of https://bitbucket.org/LightDrake/singularityviewer into V2MultiWear

Conflicts:
	indra/cmake/00-Common.cmake

indra/newview/app_settings/settings.xml

@@ -2189,38 +2189,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>
@@ -3927,6 +3905,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>
@@ -8196,6 +8196,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>
@@ -8260,7 +8271,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-	  <integer>0</integer>
+      <integer>0</integer>
     </map>
     <key>MemoryPrivatePoolSize</key>
     <map>