Merge in Dullahan support from future branch!

indra/newview/app_settings/settings.xml

@@ -3477,6 +3477,39 @@ This should be as low as possible, but too low may break functionality</string>
       <key>Value</key>
       <integer>3128</integer>
     </map>
+    <key>BrowserProxyType</key>
+    <map>
+      <key>Comment</key>
+      <string>Type of proxy for Web Browser</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>BrowserProxyUsername</key>
+    <map>
+      <key>Comment</key>
+      <string>Username for Web Proxy authentication</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string />
+    </map>
+    <key>BrowserProxyPassword</key>
+    <map>
+      <key>Comment</key>
+      <string>Password for Web Proxy authentication</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string />
+    </map>
     <key>BrowserProxySocks45</key>
     <map>
       <key>Comment</key>