From 7ba6111d9149baea48869c2f30506581d2c6babf Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Tue, 2 Oct 2012 21:32:23 +0300
Subject: 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.

---
 indra/newview/app_settings/commands.xml            | 10 ----------
 indra/newview/skins/default/xui/en/menu_viewer.xml | 10 ----------
 2 files changed, 20 deletions(-)

(limited to 'indra/newview')

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
@@ -243,16 +243,6 @@
              function="Agent.ToggleMicrophone"
              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"
-- 
cgit v1.2.3