diff options
Diffstat (limited to 'indra/newview/skins')
4 files changed, 108 insertions, 89 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml index 920f0c909a..ae686d9ab7 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml @@ -4,8 +4,8 @@ border_drop_shadow_visible="false" drop_shadow_visible="false" border="false" - bg_opaque_image="Inspector_Background" - bg_alpha_image="Toast_Background" + bg_opaque_image="Window_Foreground" + bg_alpha_image="Window_Background" bg_alpha_color="0 0 0 0" legacy_header_height="18" can_minimize="true" diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml index b9649e9c57..c4a51bcff0 100644 --- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml @@ -5,7 +5,7 @@ can_close="false" height="270" layout="topleft" - min_height="122" + min_height="280" min_width="190" name="floater_voice_controls" help_topic="floater_voice_controls" @@ -37,23 +37,23 @@ name="max_visible_items"> 5 </string> - <panel - bevel_style="out" - border="true" - follows="left|right|top" - height="62" - layout="topleft" - left="0" - name="control_panel" - top="0" - width="282"> - <panel - height="18" - follows="top|left|right" + <layout_stack + clip="false" + follows="all" + height="262" layout="topleft" left="10" - name="my_panel" + mouse_opaque="false" + name="my_call_stack" + orientation="vertical" width="263"> + <layout_panel + follows="top|left|right" + user_resize="false" + auto_resize="false" + layout="topleft" + height="26" + name="my_panel"> <avatar_icon enabled="false" follows="left|top" @@ -79,92 +79,57 @@ <output_monitor auto_update="true" draw_border="false" - follows="right" + follows="top|right" height="16" layout="topleft" name="speaking_indicator" - right="-1" - top="2" + left_pad="5" visible="true" width="20" /> - </panel> - <layout_stack - border_size="0" - clip="false" - follows="all" - height="28" - layout="topleft" - left="10" - mouse_opaque="false" - name="leave_call_stack" - orientation="horizontal" - top_pad="5" - width="263"> - <layout_panel - auto_resize="true" - follows="left|right" - height="26" - layout="topleft" - min_height="23" - min_width="5" - mouse_opaque="false" - name="left_anchor" - width="80"/> + </layout_panel> <layout_panel auto_resize="false" - follows="left|right" + user_resize="false" + follows="top|left" height="26" + visible="true" layout="topleft" - mouse_opaque="false" - min_height="24" - min_width="100" name="leave_call_btn_panel" width="100"> <button - follows="left|right" - height="24" + follows="right|top" + height="23" + top_pad="0" label="Leave Call" - left="0" name="leave_call_btn" - top="0" width="100" /> </layout_panel> - <layout_panel - auto_resize="true" - follows="left|right" - height="26" + <layout_panel + follows="all" + layout="topleft" + left="2" + top_pad="0" + height="205" + name="callers_panel" + user_resize="false" + width="280"> + <avatar_list + follows="all" + height="205" + ignore_online_status="true" layout="topleft" - mouse_opaque="false" - min_height="24" - min_width="5" - name="right_anchor" - width="80"/> - </layout_stack> - </panel> - <avatar_list - follows="all" - height="197" - ignore_online_status="true" - layout="topleft" - left="0" - multi_select="true" - name="speakers_list" - width="282" /> - <panel - filename="panel_avatar_list_item.xml" - follows="left|right|top" - height="24" - layout="topleft" - left="0" - name="non_avatar_caller" - top="70" - width="282" /> - <view_border - bevel_style="out" - follows="left|top|right|bottom" - height="206" - layout="topleft" - left="0" - top="63" - width="282" /> + multi_select="true" + name="speakers_list" + width="280" /> + <panel + filename="panel_avatar_list_item.xml" + follows="left|right|top" + height="24" + layout="topleft" + left="0" + name="non_avatar_caller" + top="10" + width="276" /> + </layout_panel> + </layout_stack> </floater> diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index 420a6eb173..bfca2f2e46 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -101,7 +101,6 @@ tool_tip="Global Volume Control" width="16" /> <text - enabled="true" follows="right|bottom" halign="center" height="12" diff --git a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml new file mode 100644 index 0000000000..60d4a7e00b --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_opaque="true" + background_visible="false" + border_visible="false" + border="false" + chrome="true" + follows="bottom" + height="150" + layout="topleft" + name="volumepulldown_floater" + width="32"> + <!-- floater background image --> + <icon + height="150" + image_name="Inspector_Background" + layout="topleft" + left="0" + name="normal_background" + top="0" + width="32" /> + <slider + control_name="AudioLevelMaster" + follows="left|top" + left="0" + top="1" + orientation="vertical" + height="120" + increment="0.05" + initial_value="0.5" + layout="topleft" + name="mastervolume" + show_text="false" + slider_label.halign="right" + top_pad="2" + volume="true"> + <slider.commit_callback + function="Vol.setControlFalse" + parameter="MuteAudio" /> + </slider> + <button + left="7" + top_pad="9" + width="18" + height="12" + follows="top|left" + name="prefs_btn" + image_unselected="Icon_Gear_Foreground" + image_disabled="Icon_Gear_Background" + image_pressed="Icon_Gear_Press" + scale_image="false"> + <button.commit_callback + function="Vol.GoAudioPrefs" /> + </button> +</panel> |