aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorJacek Antonelli2011-03-19 13:21:56 -0500
committerJacek Antonelli2011-03-19 13:21:56 -0500
commita97c08ca2fea0a98c7cba50f6ed93bdb64d5659d (patch)
tree9cbc2a392c7ea4730e9e5942a2388edde8994813 /linden/indra/newview/app_settings/settings.xml
parentFixed bad line endings (CRLF) in many files. (diff)
parentless misleading wording for linux script messages (diff)
downloadmeta-impy-a97c08ca2fea0a98c7cba50f6ed93bdb64d5659d.zip
meta-impy-a97c08ca2fea0a98c7cba50f6ed93bdb64d5659d.tar.gz
meta-impy-a97c08ca2fea0a98c7cba50f6ed93bdb64d5659d.tar.bz2
meta-impy-a97c08ca2fea0a98c7cba50f6ed93bdb64d5659d.tar.xz
Merge remote-tracking branch 'armin/exp' into exp
Diffstat (limited to 'linden/indra/newview/app_settings/settings.xml')
-rw-r--r--linden/indra/newview/app_settings/settings.xml27
1 files changed, 27 insertions, 0 deletions
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 59c2982..2a508ee 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -7990,6 +7990,33 @@
7990 <key>Value</key> 7990 <key>Value</key>
7991 <real>3.0</real> 7991 <real>3.0</real>
7992 </map> 7992 </map>
7993 <key>MediaEnableFilter</key>
7994 <map>
7995 <key>Comment</key>
7996 <string>Enable media domain filtering</string>
7997 <key>Persist</key>
7998 <integer>1</integer>
7999 <key>Type</key>
8000 <string>Boolean</string>
8001 <key>Value</key>
8002 <integer>1</integer>
8003 </map>
8004 <key>MediaFilterRect</key>
8005 <map>
8006 <key>Comment</key>
8007 <string>Rectangle for Media Filter floater</string>
8008 <key>Persist</key>
8009 <integer>1</integer>
8010 <key>Type</key>
8011 <string>Rect</string>
8012 <key>Value</key>
8013 <array>
8014 <integer>0</integer>
8015 <integer>100</integer>
8016 <integer>100</integer>
8017 <integer>100</integer>
8018 </array>
8019 </map>
7993 <key>MediaOnAPrimUI</key> 8020 <key>MediaOnAPrimUI</key>
7994 <map> 8021 <map>
7995 <key>Comment</key> 8022 <key>Comment</key>