summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorAimee Linden <aimee@lindenlab.com>2010-05-13 13:30:28 +0100
committerAimee Linden <aimee@lindenlab.com>2010-05-13 13:30:28 +0100
commit9cec4bdd696f145d78f564ea4e94cd58db3984d4 (patch)
tree1b910ff3c9881fb27d70649cc84052395318fdfa /indra/newview/app_settings
parent489a5eb9e20256da64749e85254b9511e0919607 (diff)
parent8aac4348021434ec33e9d8d301310fd7b65f6827 (diff)
EXT-7138 WIP Merged Voice fonts work into the newly modularized LLVoiceClient.
Created LLVoiceEffectInterface as an optional interface to be implemented by voice modules that support voice effects.
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/logcontrol.xml1
-rw-r--r--indra/newview/app_settings/settings.xml22
-rw-r--r--indra/newview/app_settings/settings_per_account.xml11
3 files changed, 34 insertions, 0 deletions
diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml
index d7bb64ce8a..d3fb958638 100644
--- a/indra/newview/app_settings/logcontrol.xml
+++ b/indra/newview/app_settings/logcontrol.xml
@@ -40,6 +40,7 @@
</array>
<key>tags</key>
<array>
+ <string>Voice</string>
</array>
</map>
</array>
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 4e4c0274e7..13bac70f27 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10595,6 +10595,28 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>VoiceFontsAvailable</key>
+ <map>
+ <key>Comment</key>
+ <string>Temporary debug setting to test UI with no voice effects available.</string>
+ <key>Persist</key>
+ <integer>0</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>VoiceEffectEnabled</key>
+ <map>
+ <key>Comment</key>
+ <string>Whether or not to use Voice Effects 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>
diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index 3ce32a05b0..c94ae1fca1 100644
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -99,6 +99,17 @@
<key>Value</key>
<integer>1</integer>
</map>
+ <key>VoiceEffectDefault</key>
+ <map>
+ <key>Comment</key>
+ <string>Selected voice effect</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>String</string>
+ <key>Value</key>
+ <string>00000000-0000-0000-0000-000000000000</string>
+ </map>
<!-- Settings below are for back compatibility only.
They are not used in current viewer anymore. But they can't be removed to avoid