summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAimee Linden <aimee@lindenlab.com>2010-04-29 13:42:34 +0100
committerAimee Linden <aimee@lindenlab.com>2010-04-29 13:42:34 +0100
commit93a93dfc92d5339a70f6174ae74b96fc4cb2813f (patch)
tree32d3feff8b6b95b711ec2625f6a607302243346c /indra/newview
parentb90ece0936149a69b1176adc4ae2508c61e34fd7 (diff)
Added VoiceFontUI setting for SLE
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/app_settings/settings.xml11
-rw-r--r--indra/newview/skins/default/xui/en/floater_voice_controls.xml2
2 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 45de05ae82..3a80579c7f 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10427,6 +10427,17 @@
<key>Value</key>
<string>00000000-0000-0000-0000-000000000000</string>
</map>
+ <key>VoiceFontUI</key>
+ <map>
+ <key>Comment</key>
+ <string>Whether or not to show the Voice Fonts 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/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index 44840a82d0..ce81a39fe0 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -105,7 +105,7 @@
user_resize="false"
follows="top|left"
height="26"
- visible="true"
+ visiblity_control="VoiceFontUI"
layout="topleft"
name="voice_font_panel"
width="150">