summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorPtolemy <ptolemy@lindenlab.com>2021-08-27 09:36:46 -0700
committerPtolemy <ptolemy@lindenlab.com>2021-08-27 09:36:46 -0700
commit88f335ac40ec07cf7766bc1e0e7c69087bc22357 (patch)
treec0ada3a2f433bce9d92d298c09c6e78c0addde05 /indra/newview/app_settings
parent134dc986361256d71884257cb870a1f1ac6a848c (diff)
parentc40b8310b00f1d620a2f5a94f2514c8bf3531373 (diff)
Merge branch 'master' into DRTVWR-541
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml11
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 5664ade1a2..b1120c18b2 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -2076,17 +2076,6 @@
<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>ChatBarCustomWidth</key>
<map>
<key>Comment</key>