diff options
| author | Richard Linden <none@none> | 2010-06-03 15:00:59 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-06-03 15:00:59 -0700 |
| commit | f968b6078ba764f9c9ed24be23424b59633cff71 (patch) | |
| tree | 51916d8541d3ded8ae79092e2a4df770dfc52e3a /indra/newview/app_settings/settings.xml | |
| parent | fbee0d8ef1cfd97c2ef52398d19d038c145bae67 (diff) | |
| parent | 4146416d32f9b1684343a48269a50561388fcef4 (diff) | |
merge
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 6204c8047a..bdae9c374a 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10748,6 +10748,28 @@ <key>Value</key> <integer>0</integer> </map> + <key>VoiceEffectExpiryWarningTime</key> + <map> + <key>Comment</key> + <string>How much notice to give of Voice Morph subscriptions expiry, in seconds.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>S32</string> + <key>Value</key> + <integer>259200</integer> + </map> + <key>VoiceMorphingEnabled</key> + <map> + <key>Comment</key> + <string>Whether or not to enable Voice Morphs and show the UI.</string> + <key>Persist</key> + <integer>0</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>AutoDisengageMic</key> <map> <key>Comment</key> |