summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorAimee Linden <aimee@lindenlab.com>2010-05-28 13:18:50 +0100
committerAimee Linden <aimee@lindenlab.com>2010-05-28 13:18:50 +0100
commit176b5c5a67c3bd34da787c7446d7349dc1937803 (patch)
treeae0a5b2cc367e22a11b5ef768da6d4484d2c348b /indra/newview/app_settings/settings.xml
parente5273960de222ffae32405fde8e9fd566ff72d0a (diff)
parent4f0d41090469c5b43f50308433e3cadbac9f368a (diff)
EXT-7138 FIXED Merge Voice Morphing from aimee/viewer-trunk_voice-features
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r--indra/newview/app_settings/settings.xml22
1 files changed, 22 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 59b6115fab..4dd121fd22 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10606,6 +10606,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>