summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-10-02 17:56:48 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2012-10-02 17:56:48 -0700
commit177716ee4f2ba573c6f4384737fe985f1795e8aa (patch)
tree4593cc390fd1bae6af0980a1d1fba7860e869004 /indra/newview/skins
parent7e1fbd1a897e3238a101f1db2d155f0493beaac5 (diff)
parent7ba6111d9149baea48869c2f30506581d2c6babf (diff)
merging in latest changes
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml10
1 files changed, 0 insertions, 10 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index aa131035ed..4bbf253e4a 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -244,16 +244,6 @@
parameter="speak" />
</menu_item_check>
<menu_item_check
- label="Voice settings..."
- name="Nearby Voice">
- <menu_item_check.on_check
- function="Floater.Visible"
- parameter="voice_controls" />
- <menu_item_check.on_click
- function="Floater.Toggle"
- parameter="voice_controls" />
- </menu_item_check>
- <menu_item_check
label="Voice morphing..."
name="ShowVoice"
visibility_control="VoiceMorphingEnabled">