summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexanderP ProductEngine <apaschenko@productengine.com>2012-10-02 21:32:23 +0300
committerAlexanderP ProductEngine <apaschenko@productengine.com>2012-10-02 21:32:23 +0300
commit7ba6111d9149baea48869c2f30506581d2c6babf (patch)
treeddd97b17af679d4fea0c1d1e6cf6b9dd98dee1fa
parent47abe344abb668a7b883674365ea74f30443c6bb (diff)
CHUI-190 (Remove the Voice Settings floater): removed the menu item "Communicate > Voice settings" and the FUI button (headphones) from the Toybox (Toolbox). I left a floater in the project to be able to reconnect it to a different location.
-rw-r--r--indra/newview/app_settings/commands.xml10
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml10
2 files changed, 0 insertions, 20 deletions
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 51211a8ce5..d4bbd84d0f 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -239,14 +239,4 @@
is_running_function="Floater.IsOpen"
is_running_parameters="camera"
/>
- <command name="voice"
- available_in_toybox="true"
- icon="Command_Voice_Icon"
- label_ref="Command_Voice_Label"
- tooltip_ref="Command_Voice_Tooltip"
- execute_function="Floater.ToggleOrBringToFront"
- execute_parameters="voice_controls"
- is_running_function="Floater.IsOpen"
- is_running_parameters="voice_controls"
- />
</commands>
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">