Merge remote-tracking branch 'secondlife/release/webrtc-voice' into webrtc-voice

4 files changed, 78 insertions, 42 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_incoming_call.xml b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
index 169d4c9d24..2d8089ee35 100644
--- a/indra/newview/skins/default/xui/en/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
@@ -12,7 +12,7 @@
  width="550">
     <floater.string
      name="lifetime">
-        5
+        30
     </floater.string>
     <floater.string
      name="localchat">
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index f3d44cf647..d17aec0f6a 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -561,42 +561,6 @@
              parameter="conversation" />
         </menu_item_check>
         <menu_item_separator/>
-        <menu
-         label="Voice morphing"
-         name="VoiceMorphing"
-         visibility_control="VoiceMorphingEnabled">
-            <menu_item_check
-             label="No voice morphing"
-             name="NoVoiceMorphing">
-                <menu_item_check.on_check
-                 function="Communicate.VoiceMorphing.NoVoiceMorphing.Check" />
-                <menu_item_check.on_click
-                 function="Communicate.VoiceMorphing.NoVoiceMorphing.Click" />
-            </menu_item_check>
-            <menu_item_separator/>
-            <menu_item_check
-             label="Preview..."
-             name="Preview">
-                <menu_item_check.on_check
-                 function="Floater.Visible"
-                 parameter="voice_effect" />
-                <menu_item_check.on_click
-                 function="Floater.Toggle"
-                 parameter="voice_effect" />
-            </menu_item_check>
-            <menu_item_call
-             label="Subscribe..."
-             name="Subscribe">
-                <menu_item_call.on_click
-                 function="Communicate.VoiceMorphing.Subscribe" />
-            </menu_item_call>
-            <menu_item_call
-             label="Premium perk..."
-             name="PremiumPerk">
-                <menu_item_call.on_click
-                 function="Communicate.VoiceMorphing.PremiumPerk" />
-            </menu_item_call>
-        </menu>
         <menu_item_check
          label="Gestures..."
          name="Gestures"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index b9d0ef0cc7..0ccb980803 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8831,6 +8831,20 @@ New Voice Morphs are available!
   </notification>
 
   <notification
+    icon="alertmodal.tga"
+    name="VoiceEffectsNotSupported"
+    sound="UISndAlert"
+    persist="true"
+    type="alertmodal">
+Voice Morphs are not supported by this viewer.
+    <usetemplate
+        notext="Cancel"
+        name="okcancelbuttons"
+        yestext="Disable Voice Morphing"/>
+    <tag>voice</tag>
+  </notification>
+
+  <notification
    icon="notifytip.tga"
    name="Cannot enter parcel: not a group member"
    type="notifytip">
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 7eaaaee536..eb38f8bff3 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -340,7 +340,7 @@
    follows="left|top"
    top_delta="-6"
    layout="topleft"
-   left_pad="20"
+   left_pad="10"
    width="360"
    height="40"
    name="media_ear_location">
@@ -422,7 +422,7 @@
    control_name="VoiceEarLocation"
    follows="left|top"
    layout="topleft"
-   left_pad="20"
+   left_pad="10"
    top_delta="-6"
    width="360"
    height="40"
@@ -455,11 +455,21 @@
    top_pad="10" 
    width="237"/>
   <check_box
+   control_name="VoiceEchoCancellation"
+   height="15"
+   tool_tip="Check to enable voice echo cancellation"
+   label="Echo Cancellation"
+   layout="topleft"
+   left="260"
+   name="enable_echo_cancellation"
+   top_pad="-15"
+   width="200"/>
+  <check_box
    follows="top|left"
    enabled_control="EnableVoiceChat"
    control_name="PushToTalkToggle"
    height="15"
-   label="Toggle speak on/off when I press button in toolbar"
+   label="Toggle speak on/off with toolbar button"
    layout="topleft"
    left="20"
    name="push_to_talk_toggle_check"
@@ -467,6 +477,16 @@
    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="5"/>
   <check_box
+   control_name="VoiceAutomaticGainControl"
+   height="15"
+   tool_tip="Check to enable automatic gain control"
+   label="Automatic Gain Control"
+   layout="topleft"
+   name="voice_automatic_gain_control"
+   left="260"
+   top_pad="-15"
+   width="200"/>
+  <check_box
    name="gesture_audio_play_btn"
    control_name="EnableGestureSounds"
    disabled_control="MuteAudio"
@@ -477,6 +497,44 @@
    label="Play sounds from gestures"
    top_pad="5"
    left="20"/>
+  <text
+   layout="topleft"
+   height="15"
+   left="260"
+   top_pad="-12"
+   width="100"
+   name="noise_suppression_label">
+    Noise Suppression
+  </text>
+  <combo_box
+      control_name="VoiceNoiseSuppressionLevel"
+      layout="topleft"
+      height="23"
+      left_pad="10"
+      top_pad="-18"
+      name="noise_suppression_combo"
+      width="80">
+  <item
+      label="Off"
+      name="noise_suppression_none"
+      value="0"/>
+  <item
+      label="Low"
+      name="noise_suppression_low"
+      value="1"/>
+  <item
+      label="Moderate"
+      name="noise_suppression_moderate"
+      value="2"/>
+  <item
+      label="High"
+      name="noise_suppression_high"
+      value="3"/>
+  <item
+      label="Max"
+      name="noise_suppression_max"
+      value="4"/>
+  </combo_box>
   <button
    control_name="ShowDeviceSettings"
    follows="left|top"
@@ -485,9 +543,9 @@
    label="Voice Input/Output devices"
    layout="topleft"
    left="20"
-   top_pad="9"
+   top_pad="0"
    name="device_settings_btn"
-   width="230">
+   width="200">
   </button>
     <panel
     layout="topleft"