summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-08-10 16:49:10 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-08-10 16:49:39 +0300
commitc80ad209b32e2773badf1c60476fce6671a5c147 (patch)
treef01d4b89e5d80d5a08d6be7fbefa37c68a658ea0 /indra/newview/app_settings
parent17ce44e24af77708ddd53b1f38447f5e8ed03786 (diff)
parentc40b8310b00f1d620a2f5a94f2514c8bf3531373 (diff)
Merge master (DRTVWR-531) into DRTVWR-542-meshopt
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>