diff options
5 files changed, 243 insertions, 198 deletions
diff --git a/indra/newview/llpanelvoicedevicesettings.cpp b/indra/newview/llpanelvoicedevicesettings.cpp index d8d6bcf5fd..0e6b61f316 100644 --- a/indra/newview/llpanelvoicedevicesettings.cpp +++ b/indra/newview/llpanelvoicedevicesettings.cpp @@ -149,7 +149,7 @@ void LLPanelVoiceDeviceSettings::draw() LLColor4 color; if (power_bar_idx < discrete_power) { - color = (power_bar_idx >= 3) ? LLUIColorTable::instance().getColor("OverdrivenColor") : LLUIColorTable::instance().getColor("SpeakingColor"); + color = (power_bar_idx >= 3) ? LLUIColorTable::instance().getColor("OverdrivenColor") : LLUIColorTable::instance().getColor("OutfitGalleryItemSelected"); } else { diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml index b7d992bcb4..b2cfd40d75 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences.xml @@ -108,6 +108,12 @@ help_topic="preferences_audio_tab" name="audio" /> <panel + class="panel_preference" + filename="panel_preferences_voice.xml" + label="Voice" + layout="topleft" + name="voice" /> + <panel class="panel_preference" filename="panel_preferences_chat.xml" label="Chat" 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 1dcbf4e666..18fd7fe2d3 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml @@ -35,7 +35,7 @@ name="System Volume" show_text="false" slider_label.halign="right" - top="10" + top="12" volume="true" width="300"> <slider.commit_callback @@ -316,7 +316,7 @@ follows="left|top" layout="topleft" left="23" - top_delta="25" + top_delta="35" name="Listen media from" height="15" width="180" @@ -346,6 +346,7 @@ layout="topleft" height="15" left="23" + top_delta="32" width="180" name="media_autoplay_label" halign="right"> @@ -379,6 +380,7 @@ layout="topleft" height="15" left="23" + top_delta="32" width="180" name="media_firstinteract_label" halign="right"> @@ -435,11 +437,12 @@ enabled_control="AudioStreamingMedia" value="true" follows="left|top" + layout="topleft" tool_tip="Uncheck this to hide media attached to other avatars nearby" label="Play media attached to other avatars" left="23" width="15" - top_delta="30" + top_delta="35" height="15"/> <check_box name="media_huds_autoplay" @@ -450,171 +453,7 @@ layout="topleft" tool_tip="Uncheck this to make HUDs follow the standard media auto-play setting" label="Auto-play media attached to your HUD" - left="260" - top_pad="-15" + top_delta="25" width="15" height="15"/> - <text - layout="topleft" - follows="left" - height="15" - width="187" - name="noise_suppression_label" - left="23" - top_delta="22" - halign="right"> - Microphone Noise Suppression - </text> - <combo_box - control_name="VoiceNoiseSuppressionLevel" - enabled_control="EnableVoiceChat" - follows="left|top" - layout="topleft" - left_delta="190" - top_delta="-6" - width="130" - height="23" - name="noise_suppression_combo"> - <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> - <text - type="string" - length="1" - follows="left|top" - layout="topleft" - left="23" - top_delta="30" - name="Listen from" - width="180" - height="15" - halign="right"> - Hear voice from - </text> - <combo_box - enabled_control="EnableVoiceChat" - control_name="VoiceEarLocation" - follows="left|top" - layout="topleft" - left_delta="190" - top_delta="-6" - width="130" - height="23" - name="ear_location_combo"> - <item - label="Camera position" - name="camera_position" - value="0" /> - <item - label="Avatar position" - name="avatar_position" - value="1" /> -</combo_box> - <check_box - control_name="LipSyncEnabled" - enabled_control="EnableVoiceChat" - follows="left|top" - height="15" - label="Move avatar lips when speaking" - layout="topleft" - left="20" - name="enable_lip_sync" - top_pad="8" - width="237"/> - <check_box - control_name="VoiceEchoCancellation" - enabled_control="EnableVoiceChat" - height="15" - tool_tip="Check to enable voice echo cancellation" - label="Echo Cancellation" - layout="topleft" - left="275" - 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 with toolbar button" - layout="topleft" - left="20" - name="push_to_talk_toggle_check" - width="245" - 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" - enabled_control="EnableVoiceChat" - height="15" - tool_tip="Check to enable automatic gain control" - label="Automatic Gain Control" - layout="topleft" - name="voice_automatic_gain_control" - left="275" - top_pad="-15" - width="200"/> - <check_box - name="gesture_audio_play_btn" - control_name="EnableGestureSounds" - disabled_control="MuteAudio" - value="true" - follows="left|bottom|right" - height="15" - tool_tip="Check this to hear sounds from gestures" - label="Play sounds from gestures" - top_pad="5" - left="20"/> - <check_box - control_name="VoiceVisualizerEnabled" - enabled_control="EnableVoiceChat" - height="15" - tool_tip="Check to show voice dot indicator above avatars" - label="Show voice dot above avatars" - layout="topleft" - name="voice_dot_visualizer" - left="275" - top_pad="-15" - width="200"/> - <button - control_name="ShowDeviceSettings" - enabled_control="EnableVoiceChat" - follows="left|top" - height="23" - is_toggle="true" - label="Voice Input/Output devices" - layout="topleft" - left="20" - top_pad="1" - name="device_settings_btn" - width="200"> - </button> - <panel - layout="topleft" - filename="panel_sound_devices.xml" - visiblity_control="ShowDeviceSettings" - name="device_settings_panel" - top_pad="0" - width="480" - left="18" - class="panel_voice_device_settings"/> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_voice.xml b/indra/newview/skins/default/xui/en/panel_preferences_voice.xml new file mode 100644 index 0000000000..6d8e39e03c --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_preferences_voice.xml @@ -0,0 +1,222 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel + border="true" + follows="all" + height="438" + label="Voice" + layout="topleft" + left="102" + name="voice_panel" + top="1" + width="517"> + <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="19" + 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_voice" + 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"/> + <text + layout="topleft" + follows="left" + height="15" + width="187" + name="noise_suppression_label" + left="23" + top_delta="42" + halign="right"> + Microphone Noise Suppression + </text> + <combo_box + control_name="VoiceNoiseSuppressionLevel" + enabled_control="EnableVoiceChat" + follows="left|top" + layout="topleft" + left_delta="190" + top_delta="-6" + width="130" + height="23" + name="noise_suppression_combo"> + <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> + <text + type="string" + length="1" + follows="left|top" + layout="topleft" + left="23" + top_delta="35" + name="Listen from" + width="180" + height="15" + halign="right"> + Hear voice from + </text> + <combo_box + enabled_control="EnableVoiceChat" + control_name="VoiceEarLocation" + follows="left|top" + layout="topleft" + left_delta="190" + top_delta="-6" + width="130" + height="23" + name="ear_location_combo"> + <item + label="Camera position" + name="camera_position" + value="0" /> + <item + label="Avatar position" + name="avatar_position" + value="1" /> + </combo_box> + <check_box + control_name="LipSyncEnabled" + enabled_control="EnableVoiceChat" + follows="left|top" + height="15" + label="Move avatar lips when speaking" + layout="topleft" + left="20" + name="enable_lip_sync" + top_pad="16" + width="237"/> + <check_box + follows="top|left" + enabled_control="EnableVoiceChat" + control_name="PushToTalkToggle" + height="15" + label="Toggle speak on/off with toolbar button" + layout="topleft" + left="20" + name="push_to_talk_toggle_check" + width="245" + 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="9"/> + <check_box + name="gesture_audio_play_btn" + control_name="EnableGestureSounds" + disabled_control="MuteAudio" + value="true" + follows="left|bottom|right" + layout="topleft" + height="15" + tool_tip="Check this to hear sounds from gestures" + label="Play sounds from gestures" + top_pad="9" + left="20"/> + <check_box + control_name="VoiceEchoCancellation" + enabled_control="EnableVoiceChat" + height="15" + tool_tip="Check to enable voice echo cancellation" + label="Echo Cancellation" + layout="topleft" + left="20" + name="enable_echo_cancellation" + top_pad="9" + width="200"/> + <check_box + control_name="VoiceAutomaticGainControl" + enabled_control="EnableVoiceChat" + height="15" + tool_tip="Check to enable automatic gain control" + label="Automatic Gain Control" + layout="topleft" + name="voice_automatic_gain_control" + left="20" + top_pad="9" + width="200"/> + <check_box + control_name="VoiceVisualizerEnabled" + enabled_control="EnableVoiceChat" + height="15" + tool_tip="Check to show voice dot indicator above avatars" + label="Show voice dot above avatars" + layout="topleft" + name="voice_dot_visualizer" + left="20" + top_pad="9" + width="200"/> + <button + control_name="ShowDeviceSettings" + enabled_control="EnableVoiceChat" + follows="left|top" + height="23" + is_toggle="true" + label="Voice Input/Output devices" + layout="topleft" + left="20" + top_pad="21" + name="device_settings_btn" + width="200"> + </button> + <panel + layout="topleft" + filename="panel_sound_devices.xml" + visiblity_control="ShowDeviceSettings" + name="device_settings_panel" + top_pad="0" + width="480" + left="18" + class="panel_voice_device_settings"/> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_sound_devices.xml b/indra/newview/skins/default/xui/en/panel_sound_devices.xml index b858d0ed02..72fdf20eca 100644 --- a/indra/newview/skins/default/xui/en/panel_sound_devices.xml +++ b/indra/newview/skins/default/xui/en/panel_sound_devices.xml @@ -24,28 +24,6 @@ name="device_not_loaded"> Device not loaded </string> - <icon - follows="left|top" - height="18" - image_name="Microphone_On" - left_delta="-5" - name="microphone_icon" - mouse_opaque="false" - top="7" - layout="topleft" - visible="true" - width="18" /> - <icon - follows="left|top" - height="18" - image_name="Parcel_Voice_Dark" - layout="topleft" - left_pad="220" - name="speaker_icon" - mouse_opaque="false" - top_delta="0" - visible="true" - width="22" /> <text type="string" length="1" @@ -53,8 +31,8 @@ follows="left|top" height="16" layout="topleft" - left_pad="-240" - top_delta="5" + left="18" + top="18" name="Input" width="60"> Input @@ -64,7 +42,7 @@ control_name="VoiceInputAudioDevice" follows="left|top" layout="topleft" - left_pad="0" + left_pad="25" max_chars="128" name="voice_input_device" top_delta="-5" @@ -76,9 +54,9 @@ follows="left|top" height="15" layout="topleft" - left_pad="30" name="Output" - top_delta="5" + top_delta="35" + left="18" width="60"> Output </text> @@ -87,7 +65,7 @@ height="23" follows="left|top" layout="topleft" - left_pad="0" + left_pad="25" max_chars="128" name="voice_output_device" top_delta="-4" @@ -99,7 +77,7 @@ follows="left|top" height="16" layout="topleft" - left_delta="-300" + left="18" name="My volume label" top_pad="14" width="200"> |