From cdae5ebc168d95a304b9905de7b66381723e402f Mon Sep 17 00:00:00 2001
From: Roxie Linden <roxie@lindenlab.com>
Date: Sat, 30 Mar 2024 21:58:00 -0700
Subject: Add UI for managing echo cancellation, AGC, and noise control.

Plumb audio settings through from webrtc to the sound preferences
UI (still needs some tweaking, of course.)

Also, choose stun servers based on grid.  Ultimately, the stun
stun servers will be passed up via login or something.
---
 .../default/xui/en/panel_preferences_sound.xml     | 69 ++++++++++++++++++++--
 1 file changed, 64 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins/default/xui')

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 ab2e9c72f3..3dba5d060b 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"
@@ -454,18 +454,38 @@
    name="enable_lip_sync"
    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"
    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="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"
@@ -477,6 +497,45 @@
    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"
+      enabled_control="AudioStreamingMedia"
+      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 +544,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"
-- 
cgit v1.2.3


From 4c4d23acb00960d1bc812eab4656d3f4cdcd70e3 Mon Sep 17 00:00:00 2001
From: Roxie Linden <roxie@lindenlab.com>
Date: Fri, 26 Apr 2024 21:31:06 -0700
Subject: Renegotiate voice if the voice server type has changed.

The server will send an update with new voice credentials
when another peer comes in requiring vivox, if the channel
was initially webrtc.
---
 indra/newview/skins/default/xui/en/floater_incoming_call.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

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 a7864381a9..e576310160 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">
-- 
cgit v1.2.3


From 0799f799e6ead1342babfd8f12d80afe48cfb1fa Mon Sep 17 00:00:00 2001
From: Roxie Linden <roxie@lindenlab.com>
Date: Tue, 18 Jun 2024 15:40:12 -0700
Subject: Fix crash issue when echo cancellation is enabled/disabled.

New webrtc library fixes an assert in webrtc when echo cancellation is enabled or
disabled.

Also, fix an issue where disabling media grays out noise cancellation.
---
 indra/newview/skins/default/xui/en/panel_preferences_sound.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

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 569f2318ae..eb38f8bff3 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -508,7 +508,6 @@
   </text>
   <combo_box
       control_name="VoiceNoiseSuppressionLevel"
-      enabled_control="AudioStreamingMedia"
       layout="topleft"
       height="23"
       left_pad="10"
-- 
cgit v1.2.3


From 3eab42ebd832545d4ba51a39168110859b869370 Mon Sep 17 00:00:00 2001
From: Roxie Linden <roxie@lindenlab.com>
Date: Fri, 21 Jun 2024 13:22:12 -0700
Subject: Disable voice morphing and throw up a warning if it's previously
 enabled.

---
 indra/newview/skins/default/xui/de/menu_viewer.xml |  6 ----
 indra/newview/skins/default/xui/en/menu_viewer.xml | 36 ----------------------
 .../newview/skins/default/xui/en/notifications.xml | 14 +++++++++
 indra/newview/skins/default/xui/es/menu_viewer.xml |  6 ----
 indra/newview/skins/default/xui/it/menu_viewer.xml |  6 ----
 indra/newview/skins/default/xui/ja/menu_viewer.xml |  1 -
 indra/newview/skins/default/xui/pl/menu_viewer.xml |  5 ---
 indra/newview/skins/default/xui/pt/menu_viewer.xml |  6 ----
 indra/newview/skins/default/xui/ru/menu_viewer.xml |  6 ----
 indra/newview/skins/default/xui/tr/menu_viewer.xml |  6 ----
 indra/newview/skins/default/xui/zh/menu_viewer.xml |  6 ----
 11 files changed, 14 insertions(+), 84 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index f6724d4993..8c446c1975 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -42,12 +42,6 @@
 		<menu_item_call label="Facebook..." name="Facebook"/>
 		<menu_item_call label="Twitter..." name="Twitter"/>
 		<menu_item_call label="Flickr..." name="Flickr"/>
-		<menu label="Voice-Morphing" name="VoiceMorphing">
-			<menu_item_check label="Kein Voice-Morphing" name="NoVoiceMorphing"/>
-			<menu_item_check label="Vorschau..." name="Preview"/>
-			<menu_item_call label="Abonnieren..." name="Subscribe"/>
-			<menu_item_call label="Premium-Vorteil..." name="PremiumPerk"/>
-		</menu>
 		<menu_item_check label="Gesten..." name="Gestures"/>
 		<menu_item_check label="Freunde" name="My Friends"/>
 		<menu_item_check label="Gruppen" name="My Groups"/>
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
@@ -8830,6 +8830,20 @@ New Voice Morphs are available!
    <tag>voice</tag>
   </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"
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index c22311f882..04e43f01da 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -42,12 +42,6 @@
 		<menu_item_call label="Facebook..." name="Facebook"/>
 		<menu_item_call label="Twitter..." name="Twitter"/>
 		<menu_item_call label="Flickr..." name="Flickr"/>
-		<menu label="Transformación de voz" name="VoiceMorphing">
-			<menu_item_check label="Sin transformación de voz" name="NoVoiceMorphing"/>
-			<menu_item_check label="Probar..." name="Preview"/>
-			<menu_item_call label="Suscribir..." name="Subscribe"/>
-			<menu_item_call label="Ventaja Premium..." name="PremiumPerk"/>
-		</menu>
 		<menu_item_check label="Gestos..." name="Gestures"/>
 		<menu_item_check label="Amigos" name="My Friends"/>
 		<menu_item_check label="Grupos" name="My Groups"/>
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index 043fd28ddb..85999ccbe0 100644
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -42,12 +42,6 @@
 		<menu_item_call label="Facebook..." name="Facebook"/>
 		<menu_item_call label="Twitter..." name="Twitter"/>
 		<menu_item_call label="Flickr..." name="Flickr"/>
-		<menu label="Manipolazione voce" name="VoiceMorphing">
-			<menu_item_check label="Nessuna manipolazione voce" name="NoVoiceMorphing"/>
-			<menu_item_check label="Anteprima..." name="Preview"/>
-			<menu_item_call label="Abbonati..." name="Subscribe"/>
-			<menu_item_call label="Vantaggio Premium..." name="PremiumPerk"/>
-		</menu>
 		<menu_item_check label="Gesture..." name="Gestures"/>
 		<menu_item_check label="Amici" name="My Friends"/>
 		<menu_item_check label="Gruppi" name="My Groups"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index a1f3980df4..f6b10bb121 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -74,7 +74,6 @@
 		<menu_item_check label="ボイスチャット" name="Speak"/>
 		<menu_item_check name="Conversation Log..." label="会話ログ…"/>
 		<menu_item_separator/>
-		<menu label="ボイスモーフィング" name="VoiceMorphing"/>
 		<menu_item_check label="ジェスチャー…" name="Gestures"/>
 		<menu_item_separator/>
 		<menu_item_check label="フレンド" name="My Friends"/>
diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml
index 4d03e7c780..ee162addd2 100644
--- a/indra/newview/skins/default/xui/pl/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml
@@ -35,11 +35,6 @@
 		<menu_item_check label="Czat lokalny..." name="Nearby Chat" />
 		<menu_item_check label="Mowa" name="Speak" />
 		<menu_item_check name="Conversation Log..." label="Dziennik rozmów..." />
-		<menu label="Przekształcanie głosu" name="VoiceMorphing">
-			<menu_item_check label="Bez przekształcania" name="NoVoiceMorphing" />
-			<menu_item_check label="Podgląd..." name="Preview" />
-			<menu_item_call label="Subskrybuj..." name="Subscribe" />
-		</menu>
 		<menu_item_check label="Gesty..." name="Gestures" />
 		<menu_item_check label="Znajomi" name="My Friends" />
 		<menu_item_check label="Grupy" name="My Groups" />
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index b70adc3ad2..0f4873d11c 100644
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -42,12 +42,6 @@
 		<menu_item_call label="Facebook..." name="Facebook"/>
 		<menu_item_call label="Twitter..." name="Twitter"/>
 		<menu_item_call label="Flickr..." name="Flickr"/>
-		<menu label="Distorção de voz" name="VoiceMorphing">
-			<menu_item_check label="Não distorcer voz" name="NoVoiceMorphing"/>
-			<menu_item_check label="Visualizar..." name="Preview"/>
-			<menu_item_call label="Assinar..." name="Subscribe"/>
-			<menu_item_call label="Benefício Premium..." name="PremiumPerk"/>
-		</menu>
 		<menu_item_check label="Gestos..." name="Gestures"/>
 		<menu_item_check label="Amigos" name="My Friends"/>
 		<menu_item_check label="Grupos" name="My Groups"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml
index 8361464f4c..4a6390329d 100644
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -40,12 +40,6 @@
 		<menu_item_call label="Facebook..." name="Facebook"/>
 		<menu_item_call label="Twitter..." name="Twitter"/>
 		<menu_item_call label="Flickr..." name="Flickr"/>
-		<menu label="Изменение голоса" name="VoiceMorphing">
-			<menu_item_check label="Без изменения голоса" name="NoVoiceMorphing"/>
-			<menu_item_check label="Просмотр..." name="Preview"/>
-			<menu_item_call label="Подписаться..." name="Subscribe"/>
-			<menu_item_call label="Премиум-бонус..." name="PremiumPerk"/>
-		</menu>
 		<menu_item_check label="Жесты..." name="Gestures"/>
 		<menu_item_check label="Друзья" name="My Friends"/>
 		<menu_item_check label="Группы" name="My Groups"/>
diff --git a/indra/newview/skins/default/xui/tr/menu_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml
index 1c977ba5ce..fb6111248c 100644
--- a/indra/newview/skins/default/xui/tr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml
@@ -40,12 +40,6 @@
 		<menu_item_call label="Facebook..." name="Facebook"/>
 		<menu_item_call label="Twitter..." name="Twitter"/>
 		<menu_item_call label="Flickr..." name="Flickr"/>
-		<menu label="Ses şekillendirme" name="VoiceMorphing">
-			<menu_item_check label="Ses şekillendirme yok" name="NoVoiceMorphing"/>
-			<menu_item_check label="Önizleme..." name="Preview"/>
-			<menu_item_call label="Abone ol..." name="Subscribe"/>
-			<menu_item_call label="Özel üye avantajı..." name="PremiumPerk"/>
-		</menu>
 		<menu_item_check label="Mimikler..." name="Gestures"/>
 		<menu_item_check label="Arkadaşlar" name="My Friends"/>
 		<menu_item_check label="Gruplar" name="My Groups"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index 972434dfc5..a048af7b68 100644
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -40,12 +40,6 @@
 		<menu_item_call label="臉書…" name="Facebook"/>
 		<menu_item_call label="推特…" name="Twitter"/>
 		<menu_item_call label="Flickr…" name="Flickr"/>
-		<menu label="語音變聲" name="VoiceMorphing">
-			<menu_item_check label="沒有變聲效果" name="NoVoiceMorphing"/>
-			<menu_item_check label="預覽……" name="Preview"/>
-			<menu_item_call label="訂閱……" name="Subscribe"/>
-			<menu_item_call label="付費會員獨享…" name="PremiumPerk"/>
-		</menu>
 		<menu_item_check label="姿勢…" name="Gestures"/>
 		<menu_item_check label="朋友" name="My Friends"/>
 		<menu_item_check label="群組" name="My Groups"/>
-- 
cgit v1.2.3