summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorBrad Linden <brad@lindenlab.com>2024-06-20 14:29:46 -0700
committerBrad Linden <brad@lindenlab.com>2024-06-20 14:29:46 -0700
commitc686be5b0d918d70aa4974209c0833510ff907b5 (patch)
treef537d89e3b7a579b34b4921e685428cb316ba647 /indra/newview/skins/default
parentaebfdfa48bc7a1d25801d9282b77fc3dd0f9a23a (diff)
parentd8fdf5acf8f87bdcef591b4870d229ec34642aec (diff)
Merge remote-tracking branch 'origin/release/webrtc-voice' into brad/webrtc-voice-develop
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_sound.xml1
1 files changed, 0 insertions, 1 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
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"