EXT-1924 Add the Voice on/off toggle to preferences

2 files changed, 236 insertions, 206 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 285045f2c8..90a77b22b6 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -12,32 +12,32 @@
  width="620">
     <button
      follows="right|bottom"
-     height="20"
+     height="23"
      label="OK"
      label_selected="OK"
      layout="topleft"
-     left="427"
+     right="-105"
      name="OK"
-     top="435"
+     top="433"
      width="90">
         <button.commit_callback
          function="Pref.OK" />
     </button>
     <button
      follows="right|bottom"
-     height="20"
+     height="23"
      label="Cancel"
      label_selected="Cancel"
      layout="topleft"
-     left_pad="3"
+     left_pad="5"
      name="Cancel"
-     top_delta="0"
+     right="-10"
      width="90" >
         <button.commit_callback
          function="Pref.Cancel" />
     </button>
     <tab_container
-     follows="left|top|right|bottom"
+     follows="all"
      height="410"
      layout="topleft"
      left="0"
@@ -48,14 +48,14 @@
      top="21"
      width="620">
         <panel
-		 class="panel_preference"
+	 class="panel_preference"
          filename="panel_preferences_general.xml"
          label="General"
          layout="topleft"
          help_topic="preferences_general_tab"
          name="general" />
         <panel
-		 class="panel_preference"
+	 class="panel_preference"
          filename="panel_preferences_graphics1.xml"
          label="Graphics"
          layout="topleft"
@@ -103,13 +103,6 @@
          layout="topleft"
          help_topic="preferences_advanced1_tab"
          name="advanced1" />
-        <panel
-		 class="panel_preference"
-         filename="panel_preferences_advanced2.xml"
-         label="Move or Kill"
-         layout="topleft"
-         help_topic="preferences_advanced2_tab"
-         name="advanced2" />
     </tab_container>
 
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index b1093ba17b..01f0c26650 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  border="true"
- follows="left|top|right|bottom"
+ follows="all"
  height="408"
- label="Audio &amp; Video"
+ label="Sounds"
  layout="topleft"
  left="102"
  name="Preference Media panel"
@@ -12,18 +12,20 @@
     <slider
      control_name="AudioLevelMaster"
      follows="left|top"
+     font.style="BOLD"
      height="15"
      increment="0.05"
      initial_value="0.5"
      label="Master volume"
-     label_width="125"
+     label_width="160"
      layout="topleft"
-     left="30"
+     left="0"
      name="System Volume"
      show_text="false"
+     slider_label.halign="right"
      top_pad="5"
      volume="true"
-     width="425">
+     width="350">
         <slider.commit_callback
          function="Pref.setControlFalse"
          parameter="MuteAudio" />
@@ -31,43 +33,44 @@
     <button
      control_name="MuteAudio"
      follows="top|right"
-     height="16"
-     image_selected="icn_speaker-muted_dark.tga"
-     image_unselected="icn_speaker_dark.tga"
+     height="18"
+     image_selected="parcel_drk_VoiceNo"
+     image_unselected="parcel_drk_Voice"
      is_toggle="true"
      layout="topleft"
-     left_pad="30"
+     left_pad="16"
      name="mute_audio"
      picture_style="true"
      tab_stop="false"
-     top_delta="-1"
-     width="25" />
+     top_delta="-2"
+     width="22" />
     <check_box
      control_name="MuteWhenMinimized"
-     height="16"
+     height="15"
      initial_value="true"
      label="Mute if minimized"
      layout="topleft"
-     left="165"
+     left="167"
      name="mute_when_minimized"
      top_pad="5"
      width="215" />
     <slider
      control_name="AudioLevelAmbient"
      disabled_control="MuteAudio"
-     follows="left|topt"
+     follows="left|top"
      height="15"
      increment="0.05"
      initial_value="0.5"
      label="Ambient"
-     label_width="125"
+     label_width="160"
      layout="topleft"
-     left="30"
+     left="0"
      name="Wind Volume"
      show_text="false"
-     top_pad="5"
+     slider_label.halign="right"
+     top_pad="7"
      volume="true"
-     width="300">
+     width="350">
         <slider.commit_callback
          function="Pref.setControlFalse"
          parameter="MuteAmbient" />
@@ -76,53 +79,54 @@
      control_name="MuteAmbient"
      disabled_control="MuteAudio"
      follows="top|right"
-     height="16"
-     image_selected="icn_speaker-muted_dark.tga"
-     image_unselected="icn_speaker_dark.tga"
+     height="18"
+     image_selected="parcel_drk_VoiceNo"
+     image_unselected="parcel_drk_Voice"
      is_toggle="true"
      layout="topleft"
-     left_pad="30"
+     left_pad="16"
      name="mute_wind"
      picture_style="true"
      tab_stop="false"
-     top_delta="-1"
-     width="25" />
-    <slider
-     control_name="AudioLevelSFX"
+     top_delta="-2"
+     width="22" />
+        <slider
+     control_name="AudioLevelUI"
      disabled_control="MuteAudio"
      follows="left|top"
      height="15"
      increment="0.05"
      initial_value="0.5"
-     label="Sounds"
-     label_width="125"
+     label="Buttons"
+     label_width="160"
      layout="topleft"
-     left="30"
-     name="SFX Volume"
+     left="0"
+     name="UI Volume"
      show_text="false"
-     top_pad="5"
+     slider_label.halign="right"
+     top_pad="7"
      volume="true"
-     width="300">
+     width="350">
         <slider.commit_callback
          function="Pref.setControlFalse"
-         parameter="MuteSounds" />
+         parameter="MuteUI" />
     </slider>
     <button
-     control_name="MuteSounds"
+     control_name="MuteUI"
      disabled_control="MuteAudio"
      follows="top|right"
-     height="16"
-     image_selected="icn_speaker-muted_dark.tga"
-     image_unselected="icn_speaker_dark.tga"
+     height="18"
+     image_selected="parcel_drk_VoiceNo"
+     image_unselected="parcel_drk_Voice"
      is_toggle="true"
      layout="topleft"
-     left_pad="30"
-     name="mute_sfx"
+     left_pad="16"
+     name="mute_ui"
      picture_style="true"
      tab_stop="false"
-     top_delta="-1"
-     width="25" />
-    <slider
+     top_delta="-2"
+     width="22" />
+        <slider
      control_name="AudioLevelMedia"
      disabled_control="MuteAudio"
      follows="left|top"
@@ -130,14 +134,15 @@
      increment="0.05"
      initial_value="0.5"
      label="Media"
-     label_width="125"
+     label_width="160"
      layout="topleft"
-     left="30"
+     left="0"
      name="Media Volume"
      show_text="false"
-     top_pad="5"
+     slider_label.halign="right"
+     top_pad="7"
      volume="true"
-     width="300">
+     width="350">
     <slider.commit_callback
      function="Pref.setControlFalse"
      parameter="MuteMedia" />
@@ -146,52 +151,53 @@
      control_name="MuteMedia"
      disabled_control="MuteAudio"
      follows="top|right"
-     height="16"
-     image_selected="icn_speaker-muted_dark.tga"
-     image_unselected="icn_speaker_dark.tga"
+     height="18"
+     image_selected="parcel_drk_VoiceNo"
+     image_unselected="parcel_drk_Voice"
      is_toggle="true"
      layout="topleft"
-     left_pad="30"
+     left_pad="16"
      name="mute_media"
      picture_style="true"
      tab_stop="false"
-     top_delta="-1"
-     width="25" />
+     top_delta="-2"
+     width="22" />
     <slider
-     control_name="AudioLevelUI"
+     control_name="AudioLevelSFX"
      disabled_control="MuteAudio"
      follows="left|top"
      height="15"
      increment="0.05"
      initial_value="0.5"
-     label="UI"
-     label_width="125"
+     label="Sound effects"
+     label_width="160"
+     slider_label.halign="right"
      layout="topleft"
-     left="30"
-     name="UI Volume"
+     left="0"
+     name="SFX Volume"
      show_text="false"
-     top_pad="5"
+     top_pad="7"
      volume="true"
-     width="300">
+     width="350">
         <slider.commit_callback
          function="Pref.setControlFalse"
-         parameter="MuteUI" />
+         parameter="MuteSounds" />
     </slider>
     <button
-     control_name="MuteUI"
+     control_name="MuteSounds"
      disabled_control="MuteAudio"
      follows="top|right"
-     height="16"
-     image_selected="icn_speaker-muted_dark.tga"
-     image_unselected="icn_speaker_dark.tga"
+     height="18"
+     image_selected="parcel_drk_VoiceNo"
+     image_unselected="parcel_drk_Voice"
      is_toggle="true"
      layout="topleft"
-     left_pad="30"
-     name="mute_ui"
+     left_pad="16"
+     name="mute_sfx"
      picture_style="true"
      tab_stop="false"
-     top_delta="-1"
-     width="25" />
+     top_delta="-2"
+     width="22" />
     <slider
      control_name="AudioLevelMusic"
      disabled_control="MuteAudio"
@@ -199,15 +205,16 @@
      height="15"
      increment="0.05"
      initial_value="0.5"
-     label="Music"
-     label_width="125"
+     label="Streaming music"
+     label_width="160"
      layout="topleft"
-     left="30"
+     left="0"
      name="Music Volume"
+     slider_label.halign="right"
      show_text="false"
-     top_pad="5"
+     top_pad="7"
      volume="true"
-     width="300">
+     width="350">
         <slider.commit_callback
          function="Pref.setControlFalse"
          parameter="MuteMusic" />
@@ -216,212 +223,201 @@
      control_name="MuteMusic"
      disabled_control="MuteAudio"
      follows="top|right"
-     height="16"
-     image_selected="icn_speaker-muted_dark.tga"
-     image_unselected="icn_speaker_dark.tga"
+     height="18"
+     image_selected="parcel_drk_VoiceNo"
+     image_unselected="parcel_drk_Voice"
      is_toggle="true"
      layout="topleft"
-     left_pad="30"
+     left_pad="16"
      name="mute_music"
      picture_style="true"
      tab_stop="false"
-     top_delta="-1"
-     width="25" />
+     top_delta="-2"
+     width="22" />
+     <check_box
+     height="16"
+   control_name ="EnableVoiceChat"
+    disabled_control="CmdLineDisableVoice"
+     label="Voice"
+     layout="topleft"
+     left="112"
+     name="enable_voice_check"
+     width="100">
+    </check_box>
     <slider
      control_name="AudioLevelVoice"
+     enabled_control="EnableVoiceChat"
      disabled_control="MuteAudio"
      follows="left|top"
      height="15"
      increment="0.05"
      initial_value="0.5"
-     label="Voice"
-     label_width="125"
+     label_width="160"
      layout="topleft"
-     left="30"
+     left="0"
      name="Voice Volume"
      show_text="false"
-     top_pad="5"
+     slider_label.halign="right"
+     top_pad="-15"
      volume="true"
-     width="300">
+     width="350">
         <slider.commit_callback
          function="Pref.setControlFalse"
          parameter="MuteVoice" />
     </slider>
     <button
      control_name="MuteVoice"
+     enabled_control="EnableVoiceChat"
      disabled_control="MuteAudio"
      follows="top|right"
-     height="16"
-     image_selected="icn_speaker-muted_dark.tga"
-     image_unselected="icn_speaker_dark.tga"
+     height="18"
+     image_selected="parcel_drk_VoiceNo"
+     image_unselected="parcel_drk_Voice"
      is_toggle="true"
      layout="topleft"
-     left_pad="30"
+     left_pad="16"
      name="mute_voice"
      picture_style="true"
      tab_stop="false"
-     top_delta="-1"
-     width="25" />
+     top_delta="-2"
+     width="22" />
     <text
      type="string"
      length="1"
      follows="left|top"
-     height="16"
+     height="13"
      layout="topleft"
-     left="30"
+     left="170"
      name="Listen from"
-     top_pad="5"
-     width="100">
+     width="200">
         Listen from:
     </text>
-    <radio_group
-	 enabled_control="EnableVoiceChat"
-	 control_name="VoiceEarLocation"
+    <icon
+          follows="left"
+          height="18"
+             image_name="CameraView_Off"
+             name="camera_icon"
+             mouse_opaque="false"
+             visible="true"
+             width="18" />
+         <icon
+          follows="left"
+             height="18"
+             image_name="Move_Walk_Off"
+             name="avatar_icon"
+             mouse_opaque="false"
+             visible="true"
+             width="18" />
+   <radio_group
+     enabled_control="EnableVoiceChat"
+     control_name="VoiceEarLocation"
      draw_border="false"
-     height="40"
-     layout="topleft"
-     left_delta="50"
-     name="ear_location"
-     top_pad="0"
-     width="364">
+     left="0"
+     name="ear_location">
         <radio_item
          height="16"
-         label="Listen from camera position"
+         label="Camera position"
          layout="topleft"
-         left="3"
+         left_pad="1"
          name="0"
-         top="3"
-         width="315" />
+         top_delta="-30"
+         width="200" />
         <radio_item
          height="16"
-         label="Listen from avatar position"
+         label="Avatar position"
          layout="topleft"
          left_delta="0"
          name="1"
-         top_delta="16"
-         width="315" />
+         top_delta="19"
+         width="200" />
     </radio_group>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left="30"
-     name="Sound out/in"
-     top_pad="2"
-     width="100">
-        Sound out/in:
-    </text>
     <button
      control_name="ShowDeviceSettings"
-     follows="left|top"
-     height="20"
+     follows="left|bottom"
+     height="19"
      is_toggle="true"
-     label="Device settings"
+     label="Input / Output  Devices"
      layout="topleft"
-     left_delta="55"
+     left="165"
+     top_pad="-12"
      name="device_settings_btn"
-     top_pad="0"
-     width="155" />
-  <!-- Until new panel is hooked up to code, we need to be able to get to
-    the old window to change input devices. James -->
-  <button
-    follows="left|top" 
-    label="(Old Window)"
-    name="legacy_device_window_btn"
-    left_delta="165"
-    bottom_delta="0"
-    height="20"
-    width="120"
-    commit_callback.function="Floater.Show"
-    commit_callback.parameter="pref_voicedevicesettings"    
-    />
+     width="190" />
     <panel
+    background_visible="true"
+     bg_alpha_color="DkGray"
      visiblity_control="ShowDeviceSettings"
      border="false"
-	 follows="top|left"
-     height="260"
+     follows="top|left"
+     height="145"
      label="DeviceSettings"
      layout="topleft"
      left="0"
      name="Device Settings"
-     top_pad="5"
-     width="485">
+     width="501">
+      <icon
+             height="18"
+             image_name="Microphone_On"
+             left="80"
+             name="microphone_icon"
+             mouse_opaque="false"
+             top="7"
+             visible="true"
+             width="18" />
     <text
      type="string"
      length="1"
+      font.style="BOLD"
      follows="left|top"
      height="16"
      layout="topleft"
-     left="30"
-     name="Input device (microphone):"
-     top_pad="0"
+     left_pad="3"
+     name="Input"
      width="200">
-        Input device (microphone):
+        Input
     </text>
     <combo_box
-     height="18"
+     height="19"
      layout="topleft"
-     left_delta="55"
+     left="165"
      max_chars="128"
      name="voice_input_device"
-     top_pad="2"
-     width="225" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left="30"
-     name="Output device (speakers):"
-     top_pad="5"
-     width="200">
-        Output device (speakers):
-    </text>
-    <combo_box
-     height="18"
-     layout="topleft"
-     left_delta="55"
-     max_chars="128"
-     name="voice_output_device"
-     top_pad="2"
-     width="225" />
-    <text
+     top_pad="0"
+     width="200" />
+   <text
      type="string"
      length="1"
      follows="left|top"
      height="16"
      layout="topleft"
-     left="30"
-     name="Input level:"
+     left="165"
+     name="My volume label"
      top_pad="10"
      width="200">
-        Input level
+        My volume:
     </text>
-    <slider_bar
+      <slider
      follows="left|top"
      height="17"
      increment="0.05"
      initial_value="1.0"
      layout="topleft"
-     left_delta="125"
+     left="160"
      max_val="2"
      name="mic_volume_slider"
      tool_tip="Change the volume using this slider"
-     top_delta="-1"
-     width="175" />
+     top_pad="0"
+     width="220" />
     <text
      type="string"
+     text_color="EmphasisColor"
      length="1"
      follows="left|top"
-     height="20"
+     height="18"
      layout="topleft"
      left_pad="5"
      name="wait_text"
-     top_delta="1"
-     width="200">
+     top_delta="0"
+     width="110">
         Please wait
     </text>
     <locate
@@ -459,16 +455,57 @@
      name="bar4"
      top_delta="0"
      width="20" />
-    <text
+  <!--  <text
      type="string"
-     height="40"
+     height="37"
      left="30"
      name="voice_intro_text1"
      top_pad="-4"
-     width="480"
+     width="410"
      word_wrap="true">
-        Adjust the slider to control how loud you sound to other Residents. To test the input level, simply speak into your microphone.
+        Adjust the slider to control how loud you sound to other people. To test your volume, simply speak into your microphone
+    </text>-->
+          <icon
+             height="18"
+             image_name="parcel_lght_Voice"
+             left="80"
+             name="speaker_icon"
+             mouse_opaque="false"
+             top_pad="-8"
+             visible="true"
+             width="22" />
+    <text
+    font.style="BOLD"
+     type="string"
+     length="1"
+     follows="left|top"
+     height="15"
+     layout="topleft"
+     left_pad="0"
+     name="Output"
+     width="200">
+        Output
     </text>
+    <combo_box
+     height="19"
+     layout="topleft"
+     left="165"
+     max_chars="128"
+     name="voice_output_device"
+     top_pad="0"
+     width="200" />
+    </panel>
+          <!-- Until new panel is hooked up to code, we need to be able to get to
+    the old window to change input devices. James -->
+  <button
+    follows="left|bottom"
+    label="Old"
+    name="legacy_device_window_btn"
+    height="16"
+    left="20"
+    top="-270"
+    width="40"
+    commit_callback.function="Floater.Show"
+    commit_callback.parameter="pref_voicedevicesettings"
+    />
     </panel>
-    
-</panel>