diff options
author | thickbrick | 2011-04-01 15:28:48 +0300 |
---|---|---|
committer | thickbrick | 2011-04-01 15:28:48 +0300 |
commit | 4131069d0f517180a92e8ebda20b4760ecaeb855 (patch) | |
tree | 0203cc7b40e02dc7465aae2a7d89fabdf2964686 /linden/indra/newview/app_settings/settings.xml | |
parent | Fix #832: Media Filter: handle sim hosts with no dns name. (diff) | |
download | meta-impy-4131069d0f517180a92e8ebda20b4760ecaeb855.zip meta-impy-4131069d0f517180a92e8ebda20b4760ecaeb855.tar.gz meta-impy-4131069d0f517180a92e8ebda20b4760ecaeb855.tar.bz2 meta-impy-4131069d0f517180a92e8ebda20b4760ecaeb855.tar.xz |
Fix 829: Several changes to media filter
- Adds a "less annoying" mode, which attempts to only filter scripted
streaming events. On by default (should we change that?)
- Adds UI to enable and disable the media filter, both from the filter
floater and from the preferences floater.
- Adds a button to launch the filter floater to prefences.
- Some UI tweaks to the filter floater.
Diffstat (limited to 'linden/indra/newview/app_settings/settings.xml')
-rw-r--r-- | linden/indra/newview/app_settings/settings.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 2a508ee..5bd8c7e 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml | |||
@@ -8017,6 +8017,17 @@ | |||
8017 | <integer>100</integer> | 8017 | <integer>100</integer> |
8018 | </array> | 8018 | </array> |
8019 | </map> | 8019 | </map> |
8020 | <key>MediaFilterOnlyRemoteCommands</key> | ||
8021 | <map> | ||
8022 | <key>Comment</key> | ||
8023 | <string>Whether Media Filter should only filter actions initiated remotely</string> | ||
8024 | <key>Persist</key> | ||
8025 | <integer>1</integer> | ||
8026 | <key>Type</key> | ||
8027 | <string>Boolean</string> | ||
8028 | <key>Value</key> | ||
8029 | <integer>1</integer> | ||
8030 | </map> | ||
8020 | <key>MediaOnAPrimUI</key> | 8031 | <key>MediaOnAPrimUI</key> |
8021 | <map> | 8032 | <map> |
8022 | <key>Comment</key> | 8033 | <key>Comment</key> |