diff options
| author | Richard Nelson <none@none> | 2010-09-27 09:46:20 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-09-27 09:46:20 -0700 |
| commit | ad440a68bb6a481f17ea8b0cb8f3cecf37502d51 (patch) | |
| tree | b41c81b55f73b6ebd4ee0a14dd195c07d7ce2d40 /indra/newview/app_settings | |
| parent | b25d969b61eb1e4f114ee0e632d1de9777780e9f (diff) | |
| parent | 57b8571a8acd559b7a92c2d5ffbfe96b0c4b5b98 (diff) | |
merge
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/cmd_line.xml | 2 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 24 |
2 files changed, 24 insertions, 2 deletions
diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml index 00d69f805e..962c4e9d36 100644 --- a/indra/newview/app_settings/cmd_line.xml +++ b/indra/newview/app_settings/cmd_line.xml @@ -149,7 +149,7 @@ <key>nonotifications</key> <map> <key>desc</key> - <string>User will not get any notifications. NOTE: All notifications that occur will get added to ignore file for future runs.</string> + <string>User will not get any notifications.</string> <key>map-to</key> <string>IgnoreAllNotifications</string> </map> diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index feb5ebc16d..a83291b530 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3914,7 +3914,7 @@ <key>Comment</key> <string>Ignore all notifications so we never need user input on them.</string> <key>Persist</key> - <integer>0</integer> + <integer>1</integer> <key>Type</key> <string>Boolean</string> <key>Value</key> @@ -4537,6 +4537,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>LocalFileSystemBrowsingEnabled</key> + <map> + <key>Comment</key> + <string>Enable/disable access to the local file system via the file picker</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>LoginSRVTimeout</key> <map> <key>Comment</key> @@ -11355,6 +11366,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>VoiceDisableMic</key> + <map> + <key>Comment</key> + <string>Completely disable the ability to open the mic.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>VoiceEffectExpiryWarningTime</key> <map> <key>Comment</key> |