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 5149d1bc8b..860a6112ae 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -13,721 +13,761 @@
      name="middle_mouse">
      Middle Mouse
     </panel.string>
-    <slider
-     control_name="AudioLevelMaster"
-     follows="left|top"
-     font.style="BOLD"
-     height="15"
-     increment="0.025"
-     initial_value="0.5"
-     label="Master volume"
-     label_width="120"
-     layout="topleft"
-     left="0"
-     name="System Volume"
-     show_text="false"
-     slider_label.halign="right"
-     top="10"
-     volume="true"
-     width="300">
-        <slider.commit_callback
-         function="Pref.setControlFalse"
-         parameter="MuteAudio" />
-    </slider>
-    <button
-     control_name="MuteAudio"
-     follows="top|left"
-     height="16"
-     image_selected="AudioMute_Off"
-     image_unselected="Audio_Off"
-     is_toggle="true"
-     layout="topleft"
-     left_pad="5"
-     name="mute_audio"
-     tab_stop="false"
-     width="16" />
-    <check_box
-     control_name="MuteWhenMinimized"
-     height="15"
-     initial_value="true"
-     label="Mute when minimized"
-     layout="topleft"
-     name="mute_when_minimized"
-     top_delta="3"
-     left_pad="5"
-     width="235" />
-    <slider
-     control_name="AudioLevelUI"
-     disabled_control="MuteAudio"
-     follows="left|top"
-     height="15"
-     increment="0.025"
-     initial_value="0.5"
-     label="Buttons"
-     label_width="120"
-     layout="topleft"
-     left="0"
-     name="UI Volume"
-     show_text="false"
-     slider_label.halign="right"
-     top_pad="4"
-     volume="true"
-     width="300">
-        <slider.commit_callback
-         function="Pref.setControlFalse"
-         parameter="MuteUI" />
-    </slider>
-    <button
-     control_name="MuteUI"
-     disabled_control="MuteAudio"
-     follows="top|left"
-     height="16"
-     image_selected="AudioMute_Off"
-     image_unselected="Audio_Off"
-     is_toggle="true"
-     layout="topleft"
-     left_pad="5"
-     name="mute_audio"
-     tab_stop="false"
-     width="16" />
-    <slider
-     control_name="AudioLevelAmbient"
-     disabled_control="MuteAudio"
-     follows="left|top"
-     height="15"
-     increment="0.025"
-     initial_value="0.5"
-     label="Ambient"
-     label_width="120"
-     layout="topleft"
-     left="0"
-     name="Wind Volume"
-     show_text="false"
-     slider_label.halign="right"
-     top_pad="4"
-     volume="true"
-     width="300">
-        <slider.commit_callback
-         function="Pref.setControlFalse"
-         parameter="MuteAmbient" />
-    </slider>
-    <button
-     control_name="MuteAmbient"
-     disabled_control="MuteAudio"
-     follows="top|left"
-     height="16"
-     image_selected="AudioMute_Off"
-     image_unselected="Audio_Off"
-     is_toggle="true"
-     layout="topleft"
-     left_pad="5"
-     name="mute_audio"
-     tab_stop="false"
-     width="16" />
-    <slider
-     control_name="AudioLevelSFX"
-     disabled_control="MuteAudio"
-     follows="left|top"
-     height="15"
-     increment="0.025"
-     initial_value="0.5"
-     label="Sound Effects"
-     label_width="120"
-     slider_label.halign="right"
-     layout="topleft"
-     left="0"
-     name="SFX Volume"
-     show_text="false"
-     top_pad="4"
-     volume="true"
-     width="300">
-        <slider.commit_callback
-         function="Pref.setControlFalse"
-         parameter="MuteSounds" />
-    </slider>
-    <button
-     control_name="MuteSounds"
-     disabled_control="MuteAudio"
-     follows="top|left"
-     height="16"
-     image_selected="AudioMute_Off"
-     image_unselected="Audio_Off"
-     is_toggle="true"
-     layout="topleft"
-     left_pad="5"
-     name="mute_audio"
-     tab_stop="false"
-     width="16">
-      <button.commit_callback
-      function="Pref.SetSounds"/>
-    </button>
-    <check_box
-     name="gesture_audio_play_btn"
-     control_name="EnableGestureSounds"
-     disabled_control="MuteAudio"
-     height="16"
-     layout="topleft"
-     left_pad="5"
-     tool_tip="Check this to hear sounds from gestures"
-     label="Play sounds from gestures"
-     top_delta="2"
-     width="350"/>
-    <slider
-     control_name="AudioLevelMusic"
-     disabled_control="MuteAudio"
-     follows="left|top"
-     height="15"
-     increment="0.025"
-     initial_value="0.5"
-     label="Streaming music"
-     label_width="120"
-     layout="topleft"
-     left="0"
-     name="Music Volume"
-     slider_label.halign="right"
-     show_text="false"
-     top_pad="4"
-     volume="true"
-     width="300">
-        <slider.commit_callback
-         function="Pref.setControlFalse"
-         parameter="MuteMusic" />
-    </slider>
-    <button
-     control_name="MuteMusic"
-     disabled_control="MuteAudio"
-     follows="top|left"
-     height="16"
-     image_selected="AudioMute_Off"
-     image_unselected="Audio_Off"
-     is_toggle="true"
-     layout="topleft"
-     left_pad="5"
-     name="mute_audio"
-     tab_stop="false"
-     width="16" />
-    <check_box
-     control_name="AudioStreamingMusic"
-     height="16"
-     label="Enabled"
-     layout="topleft"
-     left_pad="5"
-     name="enable_music"
-     top_delta="2"
-     width="350">
-        <check_box.commit_callback
-         function="Pref.updateMediaAutoPlayCheckbox"/>
-    </check_box>
-    <slider
-     control_name="AudioLevelMedia"
-     disabled_control="MuteAudio"
-     follows="left|top"
-     height="16"
-     increment="0.025"
-     initial_value="0.5"
-     label="Media"
-     label_width="120"
-     layout="topleft"
-     left="0"
-     name="Media Volume"
-     show_text="false"
-     slider_label.halign="right"
-     top_pad="4"
-     volume="true"
-     width="300">
-        <slider.commit_callback
-         function="Pref.setControlFalse"
-         parameter="MuteMedia" />
-    </slider>
-    <button
-     control_name="MuteMedia"
-     disabled_control="MuteAudio"
-     follows="top|left"
-     height="16"
-     image_selected="AudioMute_Off"
-     image_unselected="Audio_Off"
-     is_toggle="true"
-     layout="topleft"
-     left_pad="5"
-     name="mute_audio"
-     tab_stop="false"
-     width="16" />
-    <check_box
-     label_text.halign="left"
-     follows="left|top"
-     height="16"
-     control_name ="AudioStreamingMedia"
-     label="Enabled"
-     layout="topleft"
-     top_delta="2"
-     left_pad="5"
-     name="enable_media"
-     width="110">
-        <check_box.commit_callback
-         function="Pref.updateMediaAutoPlayCheckbox"/>
-    </check_box>
-    <slider
-     control_name="AudioLevelVoice"
-     disabled_control="MuteAudio"
-     follows="left|top"
-     height="16"
-     increment="0.025"
-     initial_value="0.5"
-     label="Voice Chat"
-     label_width="120"
-     layout="topleft"
-     left="0"
-     top_pad="4"
-     name="Voice Volume"
-     show_text="false"
-     slider_label.halign="right"
-     volume="true"
-     width="300">
-        <slider.commit_callback
-         function="Pref.setControlFalse"
-         parameter="MuteVoice" />
-    </slider>
-    <button
-     control_name="MuteVoice"
-     disabled_control="MuteAudio"
-     follows="top|left"
-     height="16"
-     image_selected="AudioMute_Off"
-     image_unselected="Audio_Off"
-     is_toggle="true"
-     layout="topleft"
-     left_pad="5"
-     name="mute_audio"
-     tab_stop="false"
-     width="16" />
-    <check_box
-     label_text.halign="left"
-     follows="left|top"
-     height="16"
-     control_name ="EnableVoiceChat"
-     disabled_control="CmdLineDisableVoice"
-     label="Enabled"
-     layout="topleft"
-     top_delta="2"
-     left_pad="5"
-     name="enable_voice_check"
-     width="110"/>
 
-    <check_box
-     name="media_auto_play_btn"
-     control_name="ParcelMediaAutoPlayEnable"
-     enabled_control="AudioStreamingMedia"
-     value="true"
-     layout="topleft"
-     height="16"
-     tool_tip="Check this to automatically start media when you log in or change regions."
-     label="Allow Media to auto-play when entering a region"
-     top_pad="5"
-     left="25"/>
-    <check_box
-     name="media_allowscript_btn"
-     control_name="PermAllowScriptedMedia"
-     value="true"
-     follows="left|bottom|right"
-     height="16"
-     tool_tip="This settings allows / disallows scripted prims from controlling your media connections"
-     label="Allow resident scripts to play media"
-     top_pad="1"
-     left="25"/>
-    <check_box
-     name="media_show_on_others_btn"
-     control_name="MediaShowOnOthers"
-     value="true"
-     follows="left|bottom|right"
-     height="16"
-     tool_tip="Uncheck this to hide media attached to other avatars nearby"
-     label="Play media attached to other avatars"
-     top_pad="1"
-     width="230"
-     left="25"/>
-
-    <check_box
-     name="media_filter"
-     control_name="MediaEnableFilter"
-     value="true"
-     follows="left|bottom|right"
-     height="16"
-     tool_tip="Check this to enable the filter that allows you to choose whether to play media from a specific host"
-     label="Enable media filter (increased security)"
-     top_pad="3"
-     left="25"/>
-    <button
-     layout="topleft"
-     follows="left|bottom"
-     height="23"
-     label="Manage Media Sites"
-     top_delta="-5"
-     left_pad="10"
-     name="edit_media_lists_button"
-     width="150">
-        <button.commit_callback
-         function="Floater.Show"
-         parameter="media_lists" />
-    </button>
-    
-    <check_box
-     control_name="ShowStreamMetadata"
-     name="ShowStreamMetadata"
-     label="Show stream title in nearby chat"
-     layout="topleft"
-     top_pad="1"
-     left="25"
-     height="18"
-     width="200" />
-    <check_box
-     top_pad="1"
-     left="45"
-     control_name="StreamMetadataAnnounceToChat"
-     name="StreamMetadataAnnounceToChat"
-     label="Send stream title to channel:"
-     layout="topleft"
-     height="18"
-     width="180" />
-    <spinner
-     top_delta="-4"
-     control_name="StreamMetadataAnnounceChannel"
-     enabled_control="StreamMetadataAnnounceToChat"
-     decimal_digits="0"
-     layout="topleft"
-     follows="left|top"
-     height="18"
-     left_pad="5"
-     increment="1"
-     initial_val="362394"
-     max_val="2147483647"
-     min_val="1"
-     name="StreamMetadataAnnounceChannel"
-     width="90" />
-
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="25"
-     name="voice_chat_settings"
-     width="180"
-     top_pad="10">
-        Voice Chat Settings
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     layout="topleft"
-     left="46"
-     top_delta="16"
-     name="Listen from"
-     width="112">
-        Listen from:
-    </text>
-    <icon
-     follows="left|top"
-     height="18"
-     image_name="Cam_FreeCam_Off"
-     layout="topleft"
-     name="camera_icon"
-     mouse_opaque="false"
-     visible="true"
-     width="18"
-     left_pad="-4"
-     top_delta="-5"/>
-    <icon
-     follows="left|top"
-     height="18"
-     image_name="Move_Walk_Off"
-     layout="topleft"
-     left_pad="170"
-     name="avatar_icon"
-     mouse_opaque="false"
-     visible="true"
-     width="18"
-     top_delta="0" />
-    <radio_group
-     enabled_control="EnableVoiceChat"
-     control_name="VoiceEarLocation"
-     draw_border="false"
-     follows="left|top"
-     layout="topleft"
-     left_delta="-168"
-     width="221"
-     height="20"
-     name="ear_location">
-        <radio_item
-         height="19"
-         label="Camera position"
-         follows="left|top"
-         layout="topleft"
-         name="0"
-         width="200"/>
-        <radio_item
-         height="19"
-         follows="left|top"
-         label="Avatar position"
-         layout="topleft"
-         left_pad="-16"
-         name="1"
-         top_delta ="0"
-         width="200" />
-    </radio_group>
-    <check_box
-     control_name="LipSyncEnabled"
-     follows="left|top"
-     height="15"
-     label="Move avatar lips when speaking"
-     layout="topleft"
-     left="44"
-     name="enable_lip_sync"
-     top_pad="5"
-     width="237"/>
-    <check_box
-     control_name="ShowVoiceVisualizersInCalls"
-     follows="left|top"
-     height="15"
-     label="Show voice visualizers in calls"
-     tool_tip="Shows Voice Indicator and move lips in world while being in private and group calls"
-     layout="topleft"
-     left="44"
-     name="Show_Voice_Visualizers_In_Calls"
-     top_pad="3"
-     width="237"/>
-    <check_box
-     follows="top|left"
-     enabled_control="EnableVoiceChat"
-     control_name="PushToTalkToggle"
-     height="15"
-     label="Toggle speak on/off when I press:"
-     layout="topleft"
-     left="44"
-     name="push_to_talk_toggle_check"
-     width="237"
-     tool_tip="When in toggle mode, press and release the trigger key ONCE to switch your microphone on or off. When not in toggle mode, the microphone broadcasts your voice only while the trigger is being held down."
-     top_pad="3"/>
-    <line_editor
-     follows="top|left"
-     control_name="PushToTalkButton"
-     enabled="false"
-     enabled_control="EnableVoiceChat"
-     height="23"
-     left="80"
-     max_length_bytes="200"
-     name="modifier_combo"
-     label="Push-to-Speak trigger"
-     top_pad="3"
-     width="200" />
-    <button
-     layout="topleft"
-     follows="top|left"
-     enabled_control="EnableVoiceChat"
-     height="23"
-     label="Set Key"
-     left_pad="5"
-     name="set_voice_hotkey_button"
-     width="100">
-        <button.commit_callback
-         function="Pref.VoiceSetKey" />
-    </button>
-    <button
-      enabled_control="EnableVoiceChat"
-      follows="top|left"
-      halign="center"
-      height="23"
-      image_overlay="Refresh_Off"
-      layout="topleft"
-      tool_tip="Reset to Middle Mouse Button"
-      mouse_opaque="true"
-      name="set_voice_middlemouse_button"
-      left_pad="5"
-      width="25">
-        <button.commit_callback
-         function="Pref.VoiceSetMiddleMouse" />
-    </button>
-    <button
-     control_name="ShowDeviceSettings"
-     follows="left|top"
-     height="23"
-     is_toggle="true"
-     label="Audio Device Settings"
-     layout="topleft"
-     left="20"
-     top_pad="3"
-     name="device_settings_btn"
-     width="190">
-    </button>
+<tab_container
+ label="Firestorm Prefs"
+ layout="topleft"
+ follows="all"
+ top="5"
+ bottom="-10"
+ left="1"
+ right="-1"
+ name="tabs"
+ tab_min_width="50"
+ tab_position="top" >
 
+    <!-- General -->
     <panel
-     background_visible="false"
-     bg_alpha_color="DkGray"
-     visiblity_control="ShowDeviceSettings"
-     border="false"
-     follows="top|left"
-     height="100"
-     label="Device Settings"
-     layout="topleft"
-     left_delta="-2"
-     name="device_settings_panel"
-     class="panel_voice_device_settings"
-     width="470"
-     top_pad="0">
-        <panel.string
-         name="default_text">
-         Default
-        </panel.string>
-        <panel.string
-         name="default system device">
-         Default system device
-        </panel.string>
-        <panel.string
-         name="name_default_system_device">
-         Default system device
-        </panel.string>
-        <panel.string
-         name="no device">
-         No device
-        </panel.string>
-        <panel.string
-         name="name_no_device">
-         No device
-        </panel.string>
+     top_pad="5"
+     bottom="-1"
+     left="1"
+     right="-1"
+     follows="all"
+     label="General"
+     name="Media General Panel" >
 
-        <icon
-         height="18"
-         image_name="Microphone_On"
-         left_delta="4"
-         name="microphone_icon"
-         mouse_opaque="false"
-         top="7"
-         visible="true"
-         width="18" />
-        <text
-         type="string"
-         length="1"
-         font.style="BOLD"
+        <slider
+         control_name="AudioLevelMaster"
          follows="left|top"
-         height="16"
-         layout="topleft"
-         left_pad="3"
-         name="Input"
-         width="70">
-            Input
-        </text>
-        <combo_box
-         height="23"
-         control_name="VoiceInputAudioDevice"
-         layout="topleft"
-         left_pad="0"
-         max_chars="128"
-         name="voice_input_device"
-         top_delta="-5"
-         width="150" />
-        <icon
-         height="18"
-         image_name="Parcel_Voice_Light"
-         left="275"
-         name="speaker_icon"
-         mouse_opaque="false"
-         top_pad="-20"
-         visible="true"
-         width="22" />
-        <text
          font.style="BOLD"
-         type="string"
-         length="1"
+         height="15"
+         increment="0.025"
+         initial_value="0.5"
+         label="Master volume"
+         label_width="120"
+         layout="topleft"
+         left="0"
+         name="System Volume"
+         show_text="false"
+         slider_label.halign="right"
+         top="10"
+         volume="true"
+         width="300">
+            <slider.commit_callback
+             function="Pref.setControlFalse"
+             parameter="MuteAudio" />
+        </slider>
+        <button
+         control_name="MuteAudio"
+         follows="top|left"
+         height="16"
+         image_selected="AudioMute_Off"
+         image_unselected="Audio_Off"
+         is_toggle="true"
+         layout="topleft"
+         left_pad="5"
+         name="mute_audio"
+         tab_stop="false"
+         width="16" />
+        <check_box
+         control_name="MuteWhenMinimized"
+         height="15"
+         initial_value="true"
+         label="Mute when minimized"
+         layout="topleft"
+         name="mute_when_minimized"
+         top_delta="3"
+         left_pad="5"
+         width="235" />
+        <slider
+         control_name="AudioLevelUI"
+         disabled_control="MuteAudio"
          follows="left|top"
          height="15"
-         layout="topleft"
-         left_pad="0"
-         name="Output"
-         width="70">
-            Output
-        </text>
-        <combo_box
-         control_name="VoiceOutputAudioDevice"
-         height="23"
-         layout="topleft"
-         left_pad="0"
-         max_chars="128"
-         name="voice_output_device"
-         top_delta="-3"
-         width="150" />
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         height="10"
-         layout="topleft"
-         left_delta="-360"
-         name="Volume label"
-         top_pad="4"
-         width="200">
-            Input Volume:
-        </text>
-        <slider_bar
-         control_name="AudioLevelMic"
-         follows="left|top"
-         height="17"
          increment="0.025"
-         initial_value="1.0"
+         initial_value="0.5"
+         label="Buttons"
+         label_width="120"
+         layout="topleft"
+         left="0"
+         name="UI Volume"
+         show_text="false"
+         slider_label.halign="right"
+         top_pad="4"
+         volume="true"
+         width="300">
+            <slider.commit_callback
+             function="Pref.setControlFalse"
+             parameter="MuteUI" />
+        </slider>
+        <button
+         control_name="MuteUI"
+         disabled_control="MuteAudio"
+         follows="top|left"
+         height="16"
+         image_selected="AudioMute_Off"
+         image_unselected="Audio_Off"
+         is_toggle="true"
+         layout="topleft"
+         left_pad="5"
+         name="mute_audio"
+         tab_stop="false"
+         width="16" />
+        <slider
+         control_name="AudioLevelAmbient"
+         disabled_control="MuteAudio"
+         follows="left|top"
+         height="15"
+         increment="0.025"
+         initial_value="0.5"
+         label="Ambient"
+         label_width="120"
+         layout="topleft"
+         left="0"
+         name="Wind Volume"
+         show_text="false"
+         slider_label.halign="right"
+         top_pad="4"
+         volume="true"
+         width="300">
+            <slider.commit_callback
+             function="Pref.setControlFalse"
+             parameter="MuteAmbient" />
+        </slider>
+        <button
+         control_name="MuteAmbient"
+         disabled_control="MuteAudio"
+         follows="top|left"
+         height="16"
+         image_selected="AudioMute_Off"
+         image_unselected="Audio_Off"
+         is_toggle="true"
+         layout="topleft"
+         left_pad="5"
+         name="mute_audio"
+         tab_stop="false"
+         width="16" />
+        <slider
+         control_name="AudioLevelSFX"
+         disabled_control="MuteAudio"
+         follows="left|top"
+         height="15"
+         increment="0.025"
+         initial_value="0.5"
+         label="Sound Effects"
+         label_width="120"
+         slider_label.halign="right"
+         layout="topleft"
+         left="0"
+         name="SFX Volume"
+         show_text="false"
+         top_pad="4"
+         volume="true"
+         width="300">
+            <slider.commit_callback
+             function="Pref.setControlFalse"
+             parameter="MuteSounds" />
+        </slider>
+        <button
+         control_name="MuteSounds"
+         disabled_control="MuteAudio"
+         follows="top|left"
+         height="16"
+         image_selected="AudioMute_Off"
+         image_unselected="Audio_Off"
+         is_toggle="true"
+         layout="topleft"
+         left_pad="5"
+         name="mute_audio"
+         tab_stop="false"
+         width="16">
+          <button.commit_callback
+          function="Pref.SetSounds"/>
+        </button>
+        <check_box
+         name="gesture_audio_play_btn"
+         control_name="EnableGestureSounds"
+         disabled_control="MuteAudio"
+         height="16"
+         layout="topleft"
+         left_pad="5"
+         tool_tip="Check this to hear sounds from gestures"
+         label="Play sounds from gestures"
+         top_delta="2"
+         width="350"/>
+        <slider
+         control_name="AudioLevelMusic"
+         disabled_control="MuteAudio"
+         follows="left|top"
+         height="15"
+         increment="0.025"
+         initial_value="0.5"
+         label="Streaming music"
+         label_width="120"
+         layout="topleft"
+         left="0"
+         name="Music Volume"
+         slider_label.halign="right"
+         show_text="false"
+         top_pad="4"
+         volume="true"
+         width="300">
+            <slider.commit_callback
+             function="Pref.setControlFalse"
+             parameter="MuteMusic" />
+        </slider>
+        <button
+         control_name="MuteMusic"
+         disabled_control="MuteAudio"
+         follows="top|left"
+         height="16"
+         image_selected="AudioMute_Off"
+         image_unselected="Audio_Off"
+         is_toggle="true"
+         layout="topleft"
+         left_pad="5"
+         name="mute_audio"
+         tab_stop="false"
+         width="16" />
+        <check_box
+         control_name="AudioStreamingMusic"
+         height="16"
+         label="Enabled"
+         layout="topleft"
+         left_pad="5"
+         name="enable_music"
+         top_delta="2"
+         width="350">
+            <check_box.commit_callback
+             function="Pref.updateMediaAutoPlayCheckbox"/>
+        </check_box>
+        <slider
+         control_name="AudioLevelMedia"
+         disabled_control="MuteAudio"
+         follows="left|top"
+         height="16"
+         increment="0.025"
+         initial_value="0.5"
+         label="Media"
+         label_width="120"
+         layout="topleft"
+         left="0"
+         name="Media Volume"
+         show_text="false"
+         slider_label.halign="right"
+         top_pad="4"
+         volume="true"
+         width="300">
+            <slider.commit_callback
+             function="Pref.setControlFalse"
+             parameter="MuteMedia" />
+        </slider>
+        <button
+         control_name="MuteMedia"
+         disabled_control="MuteAudio"
+         follows="top|left"
+         height="16"
+         image_selected="AudioMute_Off"
+         image_unselected="Audio_Off"
+         is_toggle="true"
+         layout="topleft"
+         left_pad="5"
+         name="mute_audio"
+         tab_stop="false"
+         width="16" />
+        <check_box
+         label_text.halign="left"
+         follows="left|top"
+         height="16"
+         control_name ="AudioStreamingMedia"
+         label="Enabled"
+         layout="topleft"
+         top_delta="2"
+         left_pad="5"
+         name="enable_media"
+         width="110">
+            <check_box.commit_callback
+             function="Pref.updateMediaAutoPlayCheckbox"/>
+        </check_box>
+        <slider
+         control_name="AudioLevelVoice"
+         disabled_control="MuteAudio"
+         follows="left|top"
+         height="16"
+         increment="0.025"
+         initial_value="0.5"
+         label="Voice Chat"
+         label_width="120"
+         layout="topleft"
+         left="0"
+         top_pad="4"
+         name="Voice Volume"
+         show_text="false"
+         slider_label.halign="right"
+         volume="true"
+         width="300">
+            <slider.commit_callback
+             function="Pref.setControlFalse"
+             parameter="MuteVoice" />
+        </slider>
+        <button
+         control_name="MuteVoice"
+         disabled_control="MuteAudio"
+         follows="top|left"
+         height="16"
+         image_selected="AudioMute_Off"
+         image_unselected="Audio_Off"
+         is_toggle="true"
+         layout="topleft"
+         left_pad="5"
+         name="mute_audio"
+         tab_stop="false"
+         width="16" />
+        <check_box
+         label_text.halign="left"
+         follows="left|top"
+         height="16"
+         control_name ="EnableVoiceChat"
+         disabled_control="CmdLineDisableVoice"
+         label="Enabled"
+         layout="topleft"
+         top_delta="2"
+         left_pad="5"
+         name="enable_voice_check"
+         width="110"/>
+
+        <check_box
+         name="media_auto_play_btn"
+         control_name="ParcelMediaAutoPlayEnable"
+         enabled_control="AudioStreamingMedia"
+         layout="topleft"
+         height="16"
+         width="230"
+         tool_tip="Check this to automatically start media when you log in or change regions."
+         label="Allow Media to auto-play when entering a region"
+         top_pad="10"
+         left="25"/>
+        <check_box
+         name="media_allowscript_btn"
+         control_name="PermAllowScriptedMedia"
+         follows="left|top"
+         layout="topleft"
+         height="16"
+         width="230"
+         tool_tip="This settings allows / disallows scripted prims from controlling your media connections"
+         label="Allow resident scripts to play media"
+         top_pad="1"
+         left="25"/>
+        <check_box
+         name="media_show_on_others_btn"
+         control_name="MediaShowOnOthers"
+         follows="left|top"
+         layout="topleft"
+         height="16"
+         width="230"
+         tool_tip="Uncheck this to hide media attached to other avatars nearby"
+         label="Play media attached to other avatars"
+         top_pad="1"
+         left="25"/>
+
+        <check_box
+         name="media_filter"
+         control_name="MediaEnableFilter"
+         follows="left|top"
+         layout="topleft"
+         height="16"
+         tool_tip="Check this to enable the filter that allows you to choose whether to play media from a specific host"
+         label="Enable media filter (increased security)"
+         top_pad="3"
+         left="25"/>
+        <button
+         layout="topleft"
+         follows="left|top"
+         height="23"
+         label="Manage Media Sites"
+         top_delta="-5"
+         left_pad="10"
+         name="edit_media_lists_button"
+         width="150">
+            <button.commit_callback
+             function="Floater.Show"
+             parameter="media_lists" />
+        </button>
+        
+        <check_box
+         control_name="ShowStreamMetadata"
+         name="ShowStreamMetadata"
+         label="Show stream title in nearby chat"
+         follows="left|top"
+         layout="topleft"
+         top_pad="1"
+         left="25"
+         height="18"
+         width="200" />
+        <check_box
+         top_pad="1"
+         left="45"
+         control_name="StreamMetadataAnnounceToChat"
+         name="StreamMetadataAnnounceToChat"
+         label="Send stream title to channel:"
+         layout="topleft"
+         height="18"
+         width="180" />
+        <spinner
+         top_delta="-4"
+         control_name="StreamMetadataAnnounceChannel"
+         enabled_control="StreamMetadataAnnounceToChat"
+         decimal_digits="0"
          layout="topleft"
-         left_delta="-6"
-         max_val="2"
-         name="mic_volume_slider"
-         tool_tip="Change the volume using this slider"
-         top_pad="-5"
-         width="220" />
-        <text
-         type="string"
-         text_color="EmphasisColor"
-         length="1"
          follows="left|top"
          height="18"
-         layout="topleft"
          left_pad="5"
-         name="wait_text"
-         top_delta="-1"
-         width="110">
-            Please wait
-        </text>
-        <locate
-         height="20"
-         layout="topleft"
-         left_delta="0"
-         name="bar0"
-         top_delta="-2"
-         width="20" />
-        <locate
-         height="20"
-         layout="topleft"
-         left_pad="5"
-         name="bar1"
-         top_delta="0"
-         width="20" />
-        <locate
-         height="20"
-         layout="topleft"
-         left_pad="5"
-         name="bar2"
-         top_delta="0"
-         width="20" />
-        <locate
-         height="20"
-         layout="topleft"
-         left_pad="5"
-         name="bar3"
-         top_delta="0"
-         width="20" />
-        <locate
-         height="20"
-         layout="topleft"
-         left_pad="5"
-         name="bar4"
-         top_delta="0"
-         width="20" />
+         increment="1"
+         initial_val="362394"
+         max_val="2147483647"
+         min_val="1"
+         name="StreamMetadataAnnounceChannel"
+         width="90" />
+
     </panel>
+
+    <!-- Voice -->
+    <panel
+     top_pad="5"
+     bottom="-1"
+     left="1"
+     right="-1"
+     follows="all"
+     label="Voice Settings"
+     name="Media Voice tab" >
+
+        <check_box
+         label_text.halign="left"
+         follows="left|top"
+         height="16"
+         control_name ="EnableVoiceChat"
+         disabled_control="CmdLineDisableVoice"
+         label="Enabled Voice"
+         layout="topleft"
+         top_pad="10"
+         left="25"
+         name="enable_voice_check"
+         width="110"/>
+         
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         layout="topleft"
+         left="25"
+         top_pad="10"
+         name="Listen from"
+         width="112">
+            Listen from:
+        </text>
+        <icon
+         follows="left|top"
+         height="18"
+         image_name="Cam_FreeCam_Off"
+         layout="topleft"
+         name="camera_icon"
+         mouse_opaque="false"
+         visible="true"
+         width="18"
+         left_pad="-4"
+         top_delta="-5"/>
+        <icon
+         follows="left|top"
+         height="18"
+         image_name="Move_Walk_Off"
+         layout="topleft"
+         left_pad="170"
+         name="avatar_icon"
+         mouse_opaque="false"
+         visible="true"
+         width="18"
+         top_delta="0" />
+        <radio_group
+         enabled_control="EnableVoiceChat"
+         control_name="VoiceEarLocation"
+         draw_border="false"
+         follows="left|top"
+         layout="topleft"
+         left_delta="-168"
+         width="221"
+         height="20"
+         name="ear_location">
+            <radio_item
+             height="19"
+             label="Camera position"
+             follows="left|top"
+             layout="topleft"
+             name="0"
+             width="200"/>
+            <radio_item
+             height="19"
+             follows="left|top"
+             label="Avatar position"
+             layout="topleft"
+             left_pad="-16"
+             name="1"
+             top_delta ="0"
+             width="200" />
+        </radio_group>
+
+        <check_box
+         control_name="LipSyncEnabled"
+         follows="left|top"
+         height="15"
+         label="Move avatar lips when speaking"
+         layout="topleft"
+         left="25"
+         name="enable_lip_sync"
+         top_pad="5"
+         width="237"/>
+        <check_box
+         control_name="ShowVoiceVisualizersInCalls"
+         follows="left|top"
+         height="15"
+         label="Show voice visualizers in calls"
+         tool_tip="Shows Voice Indicator and move lips in world while being in private and group calls"
+         layout="topleft"
+         left="25"
+         name="Show_Voice_Visualizers_In_Calls"
+         top_pad="3"
+         width="237"/>
+        <check_box
+         follows="top|left"
+         enabled_control="EnableVoiceChat"
+         control_name="PushToTalkToggle"
+         height="15"
+         label="Toggle speak on/off when I press:"
+         layout="topleft"
+         left="25"
+         name="push_to_talk_toggle_check"
+         width="237"
+         tool_tip="When in toggle mode, press and release the trigger key ONCE to switch your microphone on or off. When not in toggle mode, the microphone broadcasts your voice only while the trigger is being held down."
+         top_pad="3"/>
+        <line_editor
+         follows="top|left"
+         control_name="PushToTalkButton"
+         enabled="false"
+         enabled_control="EnableVoiceChat"
+         height="23"
+         left="60"
+         max_length_bytes="200"
+         name="modifier_combo"
+         label="Push-to-Speak trigger"
+         top_pad="3"
+         width="200" />
+        <button
+         layout="topleft"
+         follows="top|left"
+         enabled_control="EnableVoiceChat"
+         height="23"
+         label="Set Key"
+         left_pad="5"
+         name="set_voice_hotkey_button"
+         width="100">
+            <button.commit_callback
+             function="Pref.VoiceSetKey" />
+        </button>
+        <button
+          enabled_control="EnableVoiceChat"
+          follows="top|left"
+          halign="center"
+          height="23"
+          image_overlay="Refresh_Off"
+          layout="topleft"
+          tool_tip="Reset to Middle Mouse Button"
+          mouse_opaque="true"
+          name="set_voice_middlemouse_button"
+          left_pad="5"
+          width="25">
+            <button.commit_callback
+             function="Pref.VoiceSetMiddleMouse" />
+        </button>
+
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         layout="topleft"
+         left="10"
+         top_pad="20"
+         name="Listen from"
+         width="120">
+            Audio Device Settings:
+        </text>
+        <panel
+         background_visible="false"
+         bg_alpha_color="DkGray"
+         border="false"
+         follows="top|left|right"
+         height="100"
+         label="Device Settings"
+         layout="topleft"
+         left="10"
+         right="-5"
+         name="device_settings_panel"
+         class="panel_voice_device_settings"
+         top_pad="5">
+            <panel.string
+             name="default_text">
+             Default
+            </panel.string>
+            <panel.string
+             name="default system device">
+             Default system device
+            </panel.string>
+            <panel.string
+             name="name_default_system_device">
+             Default system device
+            </panel.string>
+            <panel.string
+             name="no device">
+             No device
+            </panel.string>
+            <panel.string
+             name="name_no_device">
+             No device
+            </panel.string>
+
+            <icon
+             height="18"
+             image_name="Microphone_On"
+             left_delta="4"
+             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_pad="3"
+             name="Input"
+             width="70">
+                Input
+            </text>
+            <combo_box
+             height="23"
+             control_name="VoiceInputAudioDevice"
+             layout="topleft"
+             left_pad="0"
+             max_chars="128"
+             name="voice_input_device"
+             top_delta="-5"
+             width="150" />
+            <icon
+             height="18"
+             image_name="Parcel_Voice_Light"
+             left="275"
+             name="speaker_icon"
+             mouse_opaque="false"
+             top_pad="-20"
+             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="70">
+                Output
+            </text>
+            <combo_box
+             control_name="VoiceOutputAudioDevice"
+             height="23"
+             layout="topleft"
+             left_pad="0"
+             max_chars="128"
+             name="voice_output_device"
+             top_delta="-3"
+             width="150" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_delta="-360"
+             name="Volume label"
+             top_pad="4"
+             width="80">
+                Input Volume:
+            </text>
+            <slider_bar
+             control_name="AudioLevelMic"
+             follows="left|top"
+             height="17"
+             increment="0.025"
+             initial_value="1.0"
+             layout="topleft"
+             left_pad="5"
+             max_val="2"
+             name="mic_volume_slider"
+             tool_tip="Change the volume using this slider"
+             top_pad="-8"
+             width="220" />
+            <text
+             type="string"
+             text_color="EmphasisColor"
+             length="1"
+             follows="left|top"
+             height="18"
+             layout="topleft"
+             left_pad="5"
+             name="wait_text"
+             top_delta="-1"
+             width="110">
+                Please wait
+            </text>
+            <locate
+             height="20"
+             layout="topleft"
+             left_delta="0"
+             name="bar0"
+             top_delta="-2"
+             width="20" />
+            <locate
+             height="20"
+             layout="topleft"
+             left_pad="5"
+             name="bar1"
+             top_delta="0"
+             width="20" />
+            <locate
+             height="20"
+             layout="topleft"
+             left_pad="5"
+             name="bar2"
+             top_delta="0"
+             width="20" />
+            <locate
+             height="20"
+             layout="topleft"
+             left_pad="5"
+             name="bar3"
+             top_delta="0"
+             width="20" />
+            <locate
+             height="20"
+             layout="topleft"
+             left_pad="5"
+             name="bar4"
+             top_delta="0"
+             width="20" />
+        </panel>
+
+    </panel>
+</tab_container>
 </panel>