diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2010-01-06 14:29:26 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2010-01-06 14:29:26 -0500 |
| commit | 657cbc3b74f0005290faf852e97d697296374566 (patch) | |
| tree | c37c60962641816531e3d735a79df60b5b067e9b /indra/newview/app_settings | |
| parent | 0f89155e295f632187704999d8ecc01f464a88d8 (diff) | |
| parent | af61dd45b3afe8b62dceeb55a2ded7a9cfa34117 (diff) | |
Merge previously-unmerged product-engine commit
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index e24e1a8605..61cb93b675 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -276,7 +276,7 @@ <key>Value</key> <real>0.5</real> </map> - <key>AudioSteamingMedia</key> + <key>AudioStreamingMedia</key> <map> <key>Comment</key> <string>Enable streaming</string> @@ -408,6 +408,17 @@ <key>Value</key> <integer>1</integer> </map> + <key>AvalinePhoneSeparator</key> + <map> + <key>Comment</key> + <string>Separator of phone parts to have Avaline numbers human readable in Voice Control Panel</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string>-</string> + </map> <key>AvatarAxisDeadZone0</key> <map> <key>Comment</key> |