Update Preferences > Sound with new layout and featureset from spec

EXT-943

1 files changed, 457 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
new file mode 100644
index 0000000000..f5f9850a4e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -0,0 +1,457 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ border="true"
+ follows="left|top|right|bottom"
+ height="408"
+ label="Audio &amp; Video"
+ layout="topleft"
+ left="102"
+ name="Preference Media panel"
+ top="1"
+ width="517">
+    <slider
+     control_name="AudioLevelMaster"
+     follows="left|top"
+     height="15"
+     increment="0.05"
+     initial_value="0.5"
+     label="Master Volume"
+     label_width="125"
+     layout="topleft"
+     left="30"
+     name="System Volume"
+     show_text="false"
+     top_pad="5"
+     volume="true"
+     width="425">
+        <slider.commit_callback
+         function="Pref.setControlFalse"
+         parameter="MuteAudio" />
+    </slider>
+    <button
+     control_name="MuteAudio"
+     follows="top|right"
+     height="16"
+     image_selected="icn_speaker-muted_dark.tga"
+     image_unselected="icn_speaker_dark.tga"
+     is_toggle="true"
+     layout="topleft"
+     left_pad="30"
+     name="mute_audio"
+     picture_style="true"
+     tab_stop="false"
+     top_delta="-1"
+     width="25" />
+    <check_box
+     control_name="MuteWhenMinimized"
+     height="16"
+     initial_value="true"
+     label="Mute if minimized"
+     layout="topleft"
+     left="165"
+     name="mute_when_minimized"
+     top_pad="5"
+     width="215" />
+    <slider
+     control_name="AudioLevelAmbient"
+     disabled_control="MuteAudio"
+     follows="left|topt"
+     height="15"
+     increment="0.05"
+     initial_value="0.5"
+     label="Ambient"
+     label_width="125"
+     layout="topleft"
+     left="30"
+     name="Wind Volume"
+     show_text="false"
+     top_pad="5"
+     volume="true"
+     width="300">
+        <slider.commit_callback
+         function="Pref.setControlFalse"
+         parameter="MuteAmbient" />
+    </slider>
+    <button
+     control_name="MuteAmbient"
+     disabled_control="MuteAudio"
+     follows="top|right"
+     height="16"
+     image_selected="icn_speaker-muted_dark.tga"
+     image_unselected="icn_speaker_dark.tga"
+     is_toggle="true"
+     layout="topleft"
+     left_pad="30"
+     name="mute_wind"
+     picture_style="true"
+     tab_stop="false"
+     top_delta="-1"
+     width="25" />
+    <slider
+     control_name="AudioLevelSFX"
+     disabled_control="MuteAudio"
+     follows="left|top"
+     height="15"
+     increment="0.05"
+     initial_value="0.5"
+     label="Sounds"
+     label_width="125"
+     layout="topleft"
+     left="30"
+     name="SFX Volume"
+     show_text="false"
+     top_pad="5"
+     volume="true"
+     width="300">
+        <slider.commit_callback
+         function="Pref.setControlFalse"
+         parameter="MuteSounds" />
+    </slider>
+    <button
+     control_name="MuteSounds"
+     disabled_control="MuteAudio"
+     follows="top|right"
+     height="16"
+     image_selected="icn_speaker-muted_dark.tga"
+     image_unselected="icn_speaker_dark.tga"
+     is_toggle="true"
+     layout="topleft"
+     left_pad="30"
+     name="mute_sfx"
+     picture_style="true"
+     tab_stop="false"
+     top_delta="-1"
+     width="25" />
+    <slider
+     control_name="AudioLevelMedia"
+     disabled_control="MuteAudio"
+     follows="left|top"
+     height="15"
+     increment="0.05"
+     initial_value="0.5"
+     label="Media"
+     label_width="125"
+     layout="topleft"
+     left="30"
+     name="Media Volume"
+     show_text="false"
+     top_pad="5"
+     volume="true"
+     width="300">
+    <slider.commit_callback
+     function="Pref.setControlFalse"
+     parameter="MuteMedia" />
+    </slider>
+    <button
+     control_name="MuteMedia"
+     disabled_control="MuteAudio"
+     follows="top|right"
+     height="16"
+     image_selected="icn_speaker-muted_dark.tga"
+     image_unselected="icn_speaker_dark.tga"
+     is_toggle="true"
+     layout="topleft"
+     left_pad="30"
+     name="mute_media"
+     picture_style="true"
+     tab_stop="false"
+     top_delta="-1"
+     width="25" />
+    <slider
+     control_name="AudioLevelUI"
+     disabled_control="MuteAudio"
+     follows="left|top"
+     height="15"
+     increment="0.05"
+     initial_value="0.5"
+     label="UI"
+     label_width="125"
+     layout="topleft"
+     left="30"
+     name="UI Volume"
+     show_text="false"
+     top_pad="5"
+     volume="true"
+     width="300">
+        <slider.commit_callback
+         function="Pref.setControlFalse"
+         parameter="MuteUI" />
+    </slider>
+    <button
+     control_name="MuteUI"
+     disabled_control="MuteAudio"
+     follows="top|right"
+     height="16"
+     image_selected="icn_speaker-muted_dark.tga"
+     image_unselected="icn_speaker_dark.tga"
+     is_toggle="true"
+     layout="topleft"
+     left_pad="30"
+     name="mute_ui"
+     picture_style="true"
+     tab_stop="false"
+     top_delta="-1"
+     width="25" />
+    <slider
+     control_name="AudioLevelMusic"
+     disabled_control="MuteAudio"
+     follows="left|top"
+     height="15"
+     increment="0.05"
+     initial_value="0.5"
+     label="Music"
+     label_width="125"
+     layout="topleft"
+     left="30"
+     name="Music Volume"
+     show_text="false"
+     top_pad="5"
+     volume="true"
+     width="300">
+        <slider.commit_callback
+         function="Pref.setControlFalse"
+         parameter="MuteMusic" />
+    </slider>
+    <button
+     control_name="MuteMusic"
+     disabled_control="MuteAudio"
+     follows="top|right"
+     height="16"
+     image_selected="icn_speaker-muted_dark.tga"
+     image_unselected="icn_speaker_dark.tga"
+     is_toggle="true"
+     layout="topleft"
+     left_pad="30"
+     name="mute_music"
+     picture_style="true"
+     tab_stop="false"
+     top_delta="-1"
+     width="25" />
+    <slider
+     control_name="AudioLevelVoice"
+     disabled_control="MuteAudio"
+     follows="left|top"
+     height="15"
+     increment="0.05"
+     initial_value="0.5"
+     label="Voice"
+     label_width="125"
+     layout="topleft"
+     left="30"
+     name="Voice Volume"
+     show_text="false"
+     top_pad="5"
+     volume="true"
+     width="300">
+        <slider.commit_callback
+         function="Pref.setControlFalse"
+         parameter="MuteVoice" />
+    </slider>
+    <button
+     control_name="MuteVoice"
+     disabled_control="MuteAudio"
+     follows="top|right"
+     height="16"
+     image_selected="icn_speaker-muted_dark.tga"
+     image_unselected="icn_speaker_dark.tga"
+     is_toggle="true"
+     layout="topleft"
+     left_pad="30"
+     name="mute_voice"
+     picture_style="true"
+     tab_stop="false"
+     top_delta="-1"
+     width="25" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="30"
+     name="Listen from"
+     top_pad="5"
+     width="100">
+        Listen from:
+    </text>
+    <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">
+        <radio_item
+         height="16"
+         label="Listen from camera position"
+         layout="topleft"
+         left="3"
+         name="0"
+         top="3"
+         width="315" />
+        <radio_item
+         height="16"
+         label="Listen from avatar position"
+         layout="topleft"
+         left_delta="0"
+         name="1"
+         top_delta="16"
+         width="315" />
+    </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
+	 enabled_control="EnableVoiceChat"
+     follows="left|top"
+     height="20"
+     label="Device Settings"
+     layout="topleft"
+     left_delta="55"
+     name="device_settings_btn"
+     top_pad="0"
+     width="155">
+		<button.commit_callback
+         function="Floater.Show"
+         parameter="pref_voicedevicesettings" />
+    </button>    
+    <panel.string
+     name="default_text">
+        Default
+    </panel.string>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="30"
+     name="Input device (microphone):"
+     top_pad="5"
+     width="200">
+        Input device (microphone):
+    </text>
+    <combo_box
+     height="18"
+     layout="topleft"
+     left_delta="70"
+     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="70"
+     max_chars="128"
+     name="voice_output_device"
+     top_pad="2"
+     width="225" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="30"
+     name="Input level:"
+     top_pad="10"
+     width="200">
+        Input Level
+    </text>
+    <slider_bar
+     follows="left|top"
+     height="17"
+     increment="0.05"
+     initial_value="1.0"
+     layout="topleft"
+     left_delta="125"
+     max_val="2"
+     name="mic_volume_slider"
+     tool_tip="Change the volume using this slider"
+     top_delta="-1"
+     width="175" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left_pad="5"
+     name="wait_text"
+     top_delta="1"
+     width="200">
+        Please wait
+    </text>
+    <locate
+     height="20"
+     layout="topleft"
+     left_delta="0"
+     name="bar0"
+     top_delta="5"
+     width="20" />
+    <locate
+     height="20"
+     layout="topleft"
+     left_pad="2"
+     name="bar1"
+     top_delta="0"
+     width="20" />
+    <locate
+     height="20"
+     layout="topleft"
+     left_pad="2"
+     name="bar2"
+     top_delta="0"
+     width="20" />
+    <locate
+     height="20"
+     layout="topleft"
+     left_pad="2"
+     name="bar3"
+     top_delta="0"
+     width="20" />
+    <locate
+     height="20"
+     layout="topleft"
+     left_pad="2"
+     name="bar4"
+     top_delta="0"
+     width="20" />
+    <text
+     type="string"
+     height="40"
+     left="30"
+     name="voice_intro_text1"
+     top_pad="-4"
+     width="480"
+     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.
+    </text>
+
+    
+</panel>