summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorMonroe Linden <monroe@lindenlab.com>2010-09-24 16:17:12 -0700
committerMonroe Linden <monroe@lindenlab.com>2010-09-24 16:17:12 -0700
commit57b8571a8acd559b7a92c2d5ffbfe96b0c4b5b98 (patch)
tree6e4799200dd42a5fc38f67efb8759b929627b70b /indra/newview/app_settings
parent54f719a842b620b67a97903467a2cb08dffa1b0e (diff)
Added the VoiceDisableMic debug setting to completely disable the ability to open the mic.
Also hoisted PTT key handling from LLVivoxVoiceClient up to LLVoiceClient. This cleans up LLVoiceModuleInterface a bit and makes the PTT logic more centralized. Reviewed by Richard.
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 9000a9e530..a83291b530 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11366,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>