diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
20 files changed, 1244 insertions, 152 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_animation_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_preview.xml index a6a6e0ec22..11773c34dc 100644 --- a/indra/newview/skins/default/xui/en/floater_animation_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_animation_preview.xml @@ -405,7 +405,7 @@ Maximum animation length is [MAX_LENGTH] seconds. layout="topleft" left_pad="0" name="preview_base_anim" - tool_tip="Use this to test your animation behavior while your avatar performs common actions"> + tool_tip="Use this to test your animation behavior while your avatar performs common actions."> <combo_box.item label="Standing" name="Standing" /> diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml index cf9e3a82fc..285045f2c8 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences.xml @@ -63,14 +63,14 @@ name="display" /> <panel class="panel_preference" - filename="panel_preferences_im.xml" + filename="panel_preferences_privacy.xml" label="Privacy" layout="topleft" help_topic="preferences_im_tab" name="im" /> <panel class="panel_preference" - filename="panel_preferences_audio.xml" + filename="panel_preferences_sound.xml" label="Sound" layout="topleft" help_topic="preferences_audio_tab" @@ -84,14 +84,14 @@ name="chat" /> <panel class="panel_preference" - filename="panel_preferences_popups.xml" + filename="panel_preferences_alerts.xml" label="Alerts" layout="topleft" help_topic="preferences_msgs_tab" name="msgs" /> <panel class="panel_preference" - filename="panel_preferences_input.xml" + filename="panel_preferences_setup.xml" label="Setup" layout="topleft" help_topic="preferences_input_tab" diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml index 4ac0edca5a..296cde92e3 100644 --- a/indra/newview/skins/default/xui/en/floater_search.xml +++ b/indra/newview/skins/default/xui/en/floater_search.xml @@ -13,7 +13,7 @@ width="620"> <floater.string name="search_url"> - http://eniac21.lindenlab.com:10001/viewer/search/ + http://eniac21.lindenlab.com:10001/viewer </floater.string> <floater.string name="loading_text"> diff --git a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml index 126bca2074..ce20b03919 100644 --- a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml +++ b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml @@ -133,16 +133,4 @@ secondlife:///app/group/00000000-0000-0000-0000-000000000000/inspect </text> - <text - follows="left|top" - font="SansSerif" - height="20" - left="0" - max_length="65536" - name="slurl_group_about" - top_pad="4" - width="150"> - secondlife:///app/group/00000000-0000-0000-0000-000000000000/about - </text> - </floater> diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml index 5bf481e9cb..181c80ebc7 100644 --- a/indra/newview/skins/default/xui/en/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml @@ -47,7 +47,6 @@ value="Grumpity ProductEngine" width="240" word_wrap="false" /> - <!-- Leave text fields blank so it doesn't flash when data arrives off the network --> <text follows="all" height="16" diff --git a/indra/newview/skins/default/xui/en/inspect_group.xml b/indra/newview/skins/default/xui/en/inspect_group.xml index d3f599cbbf..5b166e83b8 100644 --- a/indra/newview/skins/default/xui/en/inspect_group.xml +++ b/indra/newview/skins/default/xui/en/inspect_group.xml @@ -84,7 +84,8 @@ L$123 to join top="35" left_delta="110" tab_stop="false" - width="18" /> + width="18" + commit_callback.function="InspectGroup.ViewProfile" /> <button follows="bottom|left" height="23" diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml index 69d90e4c7d..2c9109449c 100644 --- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml @@ -8,7 +8,7 @@ top="0" width="320"> <icon - follows="top|right|left" + follows="top|right|left" height="24" image_name="ListItem_Over" layout="topleft" @@ -40,23 +40,22 @@ follows="left|right" font="SansSerifSmall" font.style="BOLD" - height="20" + height="15" layout="topleft" left_pad="5" name="avatar_name" - text_color="grey" - top="4" - use_ellipses="true" + top="6" + use_ellipses="true" value="Unknown" - width="162" /> + width="166" /> <text - follows="right" - font="SansSerif" - height="20" + follows="left" + font="SansSerifSmall" + height="15" layout="topleft" left_pad="10" name="avatar_status" - text_color="0.5 0.5 0.5 1" + text_color="LtGray_50" value="Away" width="50" /> <output_monitor @@ -65,40 +64,31 @@ draw_border="false" height="16" layout="topleft" - left_pad="3" + left_pad="0" mouse_opaque="true" name="speaking_indicator" - top="4" visible="true" width="20" /> <button follows="right" - font="SansSerifBigBold" - height="18" - image_disabled="Info" - image_disabled_selected="Info" - image_hover_selected="Info" - image_selected="Info" - image_unselected="Info" + height="16" + image_pressed="Info_Press" + image_hover="Info_Over" + image_unselected="Info_Off" layout="topleft" - left_pad="2" + left_pad="5" name="info_btn" picture_style="true" - top="2" - width="18" /> + width="16" /> <button follows="right" - font="SansSerifBigBold" - height="18" - image_disabled="profile_chevron_btn.tga" - image_disabled_selected="profile_chevron_btn.tga" - image_hover_selected="profile_chevron_btn_active.tga" - image_selected="profile_chevron_btn_active.tga" - image_unselected="profile_chevron_btn.tga" + height="16" + image_selected="BuyArrow_Press" + image_pressed="BuyArrow_Press" + image_unselected="BuyArrow_Press" layout="topleft" - left_pad="2" + left_pad="5" name="profile_btn" picture_style="true" - top="2" - width="18" /> + width="16" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index b4847368b2..100b2d7aaa 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -79,7 +79,7 @@ label="Move" layout="topleft" name="movement_btn" - tool_tip="Shows/Hide Movement controls" + tool_tip="Shows/hides movement controls" top="6" width="70"> <button.init_callback @@ -116,7 +116,7 @@ label="View" layout="topleft" left="0" - tool_tip="Shows/Hide Camera controls" + tool_tip="Shows/hides camera controls" top="6" name="camera_btn" width="70"> @@ -167,12 +167,12 @@ image_disabled_selected="camera_presets/camera_presets_arrow_right.png" image_disabled="camera_presets/camera_presets_arrow_right.png" name="snapshot_settings" - tool_tip="Snapshot Settings" /> + tool_tip="Snapshot settings" /> <split_button.item image_selected="camera_presets/camera_presets_snapshot.png" image_unselected="camera_presets/camera_presets_snapshot.png" name="snapshot" - tool_tip="Take Snapshot" /> + tool_tip="Take snapshot" /> </split_button> </layout_panel> <layout_panel diff --git a/indra/newview/skins/default/xui/en/panel_chat_separator.xml b/indra/newview/skins/default/xui/en/panel_chat_separator.xml index dd27595cdb..bacc750e86 100644 --- a/indra/newview/skins/default/xui/en/panel_chat_separator.xml +++ b/indra/newview/skins/default/xui/en/panel_chat_separator.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel follows="left|right|top" - height="10" + height="9" layout="topleft" left="8" name="chat_separator_container"> @@ -12,5 +12,5 @@ height="1" layout="topleft" name="chat_separator_panel" - top_pad="5" /> + top_pad="3" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_group_list_item.xml b/indra/newview/skins/default/xui/en/panel_group_list_item.xml index 3f49bfad36..6eec0ffe7a 100644 --- a/indra/newview/skins/default/xui/en/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_group_list_item.xml @@ -8,7 +8,7 @@ top="0" width="320"> <icon - follows="top|right|left" + follows="top|right|left" height="24" image_name="ListItem_Over" layout="topleft" @@ -29,14 +29,14 @@ width="320" /> <icon follows="top|left" - height="18" - image_name="icon_group.tga" + height="20" + image_name="Generic_Group" layout="topleft" left="5" mouse_opaque="true" - name="group_icon" + name="group_icon" top="4" - width="18" /> + width="20" /> <text follows="left|right" font="SansSerifSmall" @@ -44,23 +44,20 @@ layout="topleft" left_pad="5" name="group_name" - text_color="white" top="7" - use_ellipses="true" + use_ellipses="true" value="Unknown" width="263" /> <button follows="right" - height="18" - image_disabled="Info" - image_disabled_selected="Info" - image_hover_selected="Info" - image_selected="Info" - image_unselected="Info" + height="16" + image_pressed="Info_Press" + image_hover="Info_Over" + image_unselected="Info_Off" layout="topleft" name="info_btn" picture_style="true" right="-5" - top="4" - width="18" /> + top="4" + width="16" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml index 3c8bf31e13..4219d9f58f 100644 --- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml @@ -18,7 +18,7 @@ left_delta="7" left="0" name="chat_box" - tool_tip="Press Enter to say, Ctrl+Enter to shout." + tool_tip="Press Enter to say, Ctrl+Enter to shout" top="3" width="250" /> <output_monitor @@ -41,7 +41,8 @@ layout="topleft" left_pad="5" label="Log" - height="20"> + height="20" + tool_tip="Shows/hides nearby chat log"> <button.commit_callback function="Floater.Toggle" parameter="nearby_chat"/> </button> <chiclet_talk @@ -54,7 +55,9 @@ left_pad="5" name="talk" top="3" - width="100" /> + width="100" + speak_button.tool_tip="Turns microphone on/off" + show_button.tool_tip="Shows/hides voice control panel" /> <gesture_combo_box follows="right" height="20" @@ -63,5 +66,6 @@ name="Gesture" left_pad="5" top="3" - width="90" /> + width="90" + tool_tip="Shows/hides gestures" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index e53edf891d..8274beb538 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel background_visible="true" -color="DkGray" + draw_border="false" follows="all" height="570" label="People" @@ -39,24 +39,26 @@ color="DkGray" height="23" layout="topleft" left="15" + label="Filter" max_length="300" name="filter_input" - text_color="black" + text_color="Black" top="3" - width="300" /> + width="303" /> <tab_container follows="all" - height="488" + height="500" layout="topleft" left="10" name="tabs" - bevel_style="in" + tab_min_width="70" + tab_height="30" tab_position="top" - top_pad="15" + top_pad="10" width="313"> <panel - follows="all" - height="488" + follows="all" + height="500" label="Nearby" layout="topleft" left="0" @@ -66,7 +68,7 @@ color="DkGray" width="313"> <avatar_list follows="all" - height="430" + height="470" layout="topleft" left="0" name="avatar_list" @@ -74,9 +76,6 @@ color="DkGray" volume_column_width="20" width="313" /> <panel - background_visible="true" - bevel_style="none" - top_pad="0" follows="left|right|bottom" height="30" label="bottom_panel" @@ -86,7 +85,7 @@ color="DkGray" width="313"> <button follows="bottom|left" - tool_tip="Change sort and view of residents list" + tool_tip="Options" height="18" image_disabled="OptionsMenu_Disabled" image_selected="OptionsMenu_Press" @@ -100,11 +99,8 @@ color="DkGray" </panel> </panel> <panel - background_visible="true" - bevel_style="none" follows="all" - color="DkGray2" - height="460" + height="500" left="0" top="0" label="Friends" @@ -114,7 +110,7 @@ color="DkGray" width="313"> <accordion follows="all" - height="430" + height="470" layout="topleft" left="0" name="friends_accordion" @@ -153,9 +149,6 @@ color="DkGray" </accordion_tab> </accordion> <panel - background_visible="true" - bevel_style="none" - top_pad="0" follows="left|right|bottom" height="30" label="bottom_panel" @@ -165,7 +158,7 @@ color="DkGray" width="313"> <button follows="bottom|left" - tool_tip="Change sort and view of friends list" + tool_tip="Options" height="18" image_disabled="OptionsMenu_Disabled" image_selected="OptionsMenu_Press" @@ -196,7 +189,8 @@ color="DkGray" image_unselected="TrashItem_Off" image_disabled="TrashItem_Disabled" layout="topleft" - left_pad="230" + left_pad="10" + right="-10" name="del_btn" picture_style="true" tool_tip="Remove selected person from your Friends list" @@ -205,10 +199,8 @@ color="DkGray" </panel> </panel> <panel - background_visible="true" - bevel_style="none" follows="all" - height="390" + height="500" label="Groups" top="0" layout="topleft" @@ -217,16 +209,13 @@ color="DkGray" width="313"> <group_list follows="all" - height="357" + height="470" layout="topleft" - color="DkGray2" left="0" name="group_list" - top="2" + top="0" width="313" /> <panel - background_visible="true" - bevel_style="none" top_pad="0" follows="left|right|bottom" height="30" @@ -237,7 +226,7 @@ color="DkGray" width="313"> <button follows="bottom|left" - tool_tip="Change sort and view of groups list" + tool_tip="Options" height="18" image_disabled="OptionsMenu_Disabled" image_selected="OptionsMenu_Press" @@ -246,7 +235,7 @@ color="DkGray" left="10" name="groups_viewsort_btn" picture_style="true" - top="5" + top="7" width="18" /> <button follows="bottom|left" @@ -265,8 +254,8 @@ color="DkGray" follows="bottom|left" height="10" image_hover_selected="Activate_Checkmark" - image_selected="Activate_Checkmark" - image_unselected="Activate_Checkmark" + image_selected="Activate_Checkmark" + image_unselected="Activate_Checkmark" layout="topleft" left_pad="24" name="activate_btn" @@ -280,7 +269,8 @@ color="DkGray" image_selected="TrashItem_Press" image_unselected="TrashItem_Off" layout="topleft" - left_pad="196" + left_pad="10" + right="-10" name="minus_btn" picture_style="true" tool_tip="Leave selected group" @@ -289,20 +279,17 @@ color="DkGray" </panel> </panel> <panel - background_visible="true" - bevel_style="none" top="0" follows="all" - height="390" + height="500" label="Recent" layout="topleft" help_topic="people_recent_tab" name="recent_panel" width="313"> <avatar_list - color="DkGray2" follows="all" - height="357" + height="470" layout="topleft" left="0" name="avatar_list" @@ -321,8 +308,7 @@ color="DkGray" width="313"> <button follows="bottom|left" - font="SansSerifBigBold" - tool_tip="Change sort and view of recent residents list" + tool_tip="Options" height="18" image_disabled="OptionsMenu_Disabled" image_selected="OptionsMenu_Press" @@ -331,7 +317,7 @@ color="DkGray" left="10" name="recent_viewsort_btn" picture_style="true" - top="5" + top="7" width="18" /> </panel> </panel> @@ -340,7 +326,7 @@ color="DkGray" animate="false" border_size="0" follows="left|right|bottom" - height="27" + height="25" layout="topleft" left="10" name="button_bar" @@ -357,8 +343,8 @@ color="DkGray" width="65"> <button follows="top|left|right" - font="SansSerifSmallBold" - height="25" + font="SansSerifSmall" + height="19" label="Profile" layout="topleft" name="view_profile_btn" @@ -374,29 +360,29 @@ color="DkGray" min_width="85" name="add_friend_btn_panel" top_delta="0" - width="85"> + width="50"> <button follows="top|left|right" - font="SansSerifSmallBold" - height="25" - label="Add Friend" + font="SansSerifSmall" + height="19" + label="Add" layout="topleft" name="add_friend_btn" tool_tip="Add selected resident to your friends List" - width="85" /> + width="50" /> </layout_panel> <layout_panel default_tab_group="1" follows="left|top|right" - height="25" + height="19" layout="topleft" min_width="80" name="group_info_btn_panel" width="80"> <button follows="top|left|right" - font="SansSerifSmallBold" - height="25" + font="SansSerifSmall" + height="19" label="Group Profile" layout="topleft" name="group_info_btn" @@ -414,8 +400,8 @@ color="DkGray" width="45"> <button follows="top|left|right" - font="SansSerifSmallBold" - height="25" + font="SansSerifSmall" + height="19" label="Chat" layout="topleft" name="chat_btn" @@ -433,8 +419,8 @@ color="DkGray" width="35"> <button follows="top|left|right" - font="SansSerifSmallBold" - height="25" + font="SansSerifSmall" + height="19" label="IM" layout="topleft" name="im_btn" @@ -454,8 +440,8 @@ color="DkGray" <button enabled="false" follows="top|left|right" - font="SansSerifSmallBold" - height="25" + font="SansSerifSmall" + height="19" label="Call" layout="topleft" name="call_btn" @@ -472,15 +458,15 @@ color="DkGray" width="65"> <button follows="left|top|right" - font="SansSerifSmallBold" - height="25" + font="SansSerifSmall" + height="19" label="Teleport" layout="topleft" name="teleport_btn" tool_tip="Offer teleport" width="65" /> </layout_panel> - <layout_panel + <layout_panel default_tab_group="1" enabled="false" follows="left|top|right" @@ -494,8 +480,8 @@ color="DkGray" <button enabled="false" follows="top|left|right" - font="SansSerifSmallBold" - height="25" + font="SansSerifSmall" + height="19" label="Share" layout="topleft" name="share_btn" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml new file mode 100644 index 0000000000..159323538c --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml @@ -0,0 +1,122 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + border="true" + height="500" + label="Popups" + layout="topleft" + left="0" + name="popups" + top="500" + width="517"> + <text + type="string" + length="1" + follows="top|left" + height="12" + layout="topleft" + left="30" + name="tell_me_label" + top="10" + width="300"> + Tell me: + </text> + <check_box + control_name="NotifyMoneyChange" + height="16" + label="When I spend or get L$" + layout="topleft" + left_delta="50" + name="notify_money_change_checkbox" + top_pad="4" + width="300" /> + <check_box + control_name="ChatOnlineNotification" + enabled="false" + height="16" + label="When my friends log out or in" + layout="topleft" + left_delta="0" + name="friends_online_notify_checkbox" + top_pad="4" + width="300" /> + <text + type="string" + length="1" + follows="top|left" + font="SansSerifBold" + height="12" + layout="topleft" + left="30" + name="show_label" + top_pad="14" + width="450"> + Always show these alerts: + </text> + <scroll_list + follows="top|left" + height="92" + layout="topleft" + left="10" + multi_select="true" + name="enabled_popups" + width="475" /> + <button + enabled_control="FirstSelectedDisabledPopups" + follows="top|left" + height="20" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_overlay="Arrow_Up" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + layout="topleft" + left_delta="137" + name="enable_this_popup" + picture_style="true" + top_pad="10" + width="43"> + <button.commit_callback + function="Pref.ClickEnablePopup" /> + </button> + <button + enabled_control="FirstSelectedEnabledPopups" + follows="top|left" + height="20" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_overlay="Arrow_Down" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + layout="topleft" + left_pad="50" + name="disable_this_popup" + picture_style="true" + top_delta="0" + width="43"> + <button.commit_callback + function="Pref.ClickDisablePopup" /> + </button> + <text + type="string" + length="1" + follows="top|left" + font="SansSerifBold" + height="12" + layout="topleft" + left="30" + name="dont_show_label" + top_pad="10" + width="450"> + Never show these alerts: + </text> + <scroll_list + follows="top|left" + height="92" + layout="topleft" + left="10" + multi_select="true" + name="disabled_popups" + width="475" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml index f4696152f9..051cb51d25 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -29,7 +29,7 @@ height="16" label="Medium" layout="topleft" - left_pad="12" + left_delta="145" name="radio2" top_delta="0" width="125" /> @@ -37,7 +37,7 @@ height="16" label="Large" layout="topleft" - left_pad="12" + left_delta="170" name="radio3" top_delta="0" width="125" /> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index 84fcf21623..519b469868 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -26,7 +26,7 @@ height="16" label="Use fullscreen" layout="topleft" - left_delta="30" + left_delta="50" name="windowed mode" top_pad="4" width="175"> @@ -103,7 +103,7 @@ increment="0.025" initial_value="1" layout="topleft" - left_delta="32" + left_delta="52" max_val="1.4" min_val="0.75" name="ui_scale_slider" @@ -304,7 +304,7 @@ layout="topleft" left_delta="0" name="BasicShaders" - tool_tip="Disabling this option may prevent some graphics card drivers from crashing." + tool_tip="Disabling this option may prevent some graphics card drivers from crashing" top_pad="1" width="315"> <check_box.commit_callback diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml new file mode 100644 index 0000000000..c4dc8834db --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml @@ -0,0 +1,209 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + border="true" + follows="left|top|right|bottom" + height="408" + label="Communication" + layout="topleft" + left="102" + name="im" + top="1" + width="517"> + <panel.string + name="log_in_to_change"> + log in to change + </panel.string> + <button + follows="left|bottom" + height="20" + label="Clear History" + layout="topleft" + left="30" + name="clear_cache" + top="10" + width="145"> + <button.commit_callback + function="Pref.WebClearCache" /> + </button> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_pad="10" + mouse_opaque="false" + name="cache_size_label_l" + top_delta="3" + text_color="LtGray_50" + width="300"> + (Locations, images, web, search history) + </text> + <check_box + height="16" + enabled="false" + label="Only friends and groups know I'm online" + layout="topleft" + left="30" + name="online_visibility" + top_pad="20" + width="350" /> + <check_box + enabled_control="EnableVoiceChat" + control_name="VoiceCallsFriendsOnly" + height="16" + label="Only friends and groups can call or IM me" + layout="topleft" + left="30" + name="voice_call_friends_only_check" + top_pad="10" + width="350" /> + <check_box + enabled_control="EnableVoiceChat" + control_name="AutoDisengageMic" + height="16" + label="Switch off microphone when ending calls" + layout="topleft" + left="30" + name="auto_disengage_mic_check" + top_pad="10" + width="350" /> + <check_box + control_name="CookiesEnabled" + height="16" + label="Accept cookies" + layout="topleft" + left="30" + name="cookies_enabled" + top_pad="10" + width="350" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="30" + mouse_opaque="false" + top_pad="10" + width="350"> + Logs: + </text> + <check_box + enabled="false" + control_name="LogInstantMessages" + height="16" + label="Save logs on my computer" + layout="topleft" + left="30" + name="log_instant_messages" + top_pad="10" + width="350"> + <check_box.commit_callback + function="Pref.Logging" /> + </check_box> + <radio_group + control_name="IMLogOptions" + enabled="false" + height="80" + layout="topleft" + left_delta="50" + name="ChatIMLogs" + width="350" + top_pad="0"> + <radio_item + height="16" + label="Chat" + layout="topleft" + left="0" + name="radio1" + top="3" + width="200" /> + <radio_item + height="16" + label="IM" + layout="topleft" + left_delta="0" + name="radio2" + top_pad="3" + width="200" /> + <radio_item + height="16" + label="Both, together" + layout="topleft" + left_delta="0" + name="radio3" + top_pad="3" + width="200" /> + <radio_item + height="16" + label="Both, separate" + layout="topleft" + left_delta="0" + name="radio4" + top_pad="3" + width="200" /> + </radio_group> + <check_box + control_name="LogTimestamp" + enabled="false" + height="16" + label="Add timestamp" + layout="topleft" + left_delta="0" + name="show_timestamps_check_im" + top_pad="10" + width="237" /> + <line_editor + bottom="366" + control_name="InstantMessageLogFolder" + enabled="false" + follows="top|left|right" + halign="right" + height="19" + layout="topleft" + left_delta="0" + mouse_opaque="false" + name="log_path_string" + top_pad="5" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_delta="0" + mouse_opaque="false" + top_pad="1" + width="128" + text_color="LtGray_50"> + Location of logs + </text> + <button + enabled="false" + follows="right|bottom" + height="20" + label="Browse" + label_selected="Browse" + layout="topleft" + left_pad="115" + name="log_path_button" + top_delta="-21" + width="145"> + <button.commit_callback + function="Pref.LogPath" /> + </button> + <button + follows="left|bottom" + height="20" + label="Block List" + layout="topleft" + left="30" + name="block_list" + top_pad="20" + width="145"> + <button.commit_callback + function="SideTray.ShowPanel" + parameter="panel_block_list_sidetray" /> + </button> + </panel> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml new file mode 100644 index 0000000000..df347cfb5f --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -0,0 +1,341 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + border="true" + follows="left|top|right|bottom" + height="408" + label="Input & Camera" + layout="topleft" + left="102" + name="Input panel" + top="1" + width="517"> + <button + height="20" + label="Other Devices" + layout="topleft" + left="30" + name="joystick_setup_button" + top="10" + width="155"> + <button.commit_callback + function="Floater.Show" + parameter="pref_joystick" /> + </button> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="30" + name="Mouselook:" + top_pad="10" + width="300"> + Mouselook: + </text> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_delta="50" + name=" Mouse Sensitivity" + top_pad="10" + width="150"> + Mouse sensitivity + </text> + <slider + control_name="MouseSensitivity" + follows="left|top" + height="15" + initial_value="2" + layout="topleft" + show_text="false" + left_delta="150" + max_val="15" + name="mouse_sensitivity" + top_delta="0" + width="145" /> + <check_box + control_name="InvertMouse" + height="16" + label="Invert" + layout="topleft" + left_pad="2" + name="invert_mouse" + top_delta="0" + width="128" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="30" + name="Network:" + mouse_opaque="false" + top_pad="4" + width="300"> + Network: + </text> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_delta="50" + name="Maximum bandwidth" + mouse_opaque="false" + top_pad="10" + width="200"> + Maximum bandwidth + </text> + <slider + can_edit_text="true" + control_name="ThrottleBandwidthKBPS" + decimal_digits="0" + follows="left|top" + height="15" + increment="10" + initial_value="50" + layout="topleft" + left_delta="150" + max_val="1500" + min_val="50" + name="max_bandwidth" + top_delta="0" + width="180" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_pad="6" + mouse_opaque="false" + name="text_box2" + top_delta="1" + width="200"> + kbps + </text> + <check_box + control_name="ConnectionPortEnabled" + height="16" + label="Custom port" + layout="topleft" + left="77" + name="connection_port_enabled" + top_pad="20" + width="256"> + <check_box.commit_callback + function="Notification.Show" + parameter="ChangeConnectionPort" /> + </check_box> + <spinner + control_name="BrowserProxyPort" + enabled_control="BrowserProxyEnabled" + decimal_digits="0" + follows="left|top" + height="16" + increment="1" + initial_value="80" + label="Port Number:" + label_width="75" + layout="topleft" + left_delta="160" + max_val="12000" + min_val="10" + name="web_proxy_port" + top_delta="-2" + width="140" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="80" + mouse_opaque="false" + name="cache_size_label_l" + top_pad="20" + width="200"> + Cache size + </text> + <slider + can_edit_text="true" + control_name="CacheSize" + decimal_digits="0" + follows="left|top" + height="15" + increment="10" + initial_value="50" + layout="topleft" + left_delta="150" + max_val="1000" + min_val="10" + name="cache_size" + top_delta="-1" + width="180" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_pad="6" + mouse_opaque="false" + name="text_box5" + top_delta="1" + width="40"> + MB + </text> + <line_editor + control_name="CacheLocationTopFolder" + border_style="line" + border_thickness="1" + enabled="false" + follows="left|top" + font="SansSerif" + handle_edit_keys_directly="true" + height="20" + layout="topleft" + left="80" + max_length="4096" + name="cache_location" + top_pad="20" + width="205" /> + <button + follows="left|top" + height="22" + label="Browse" + label_selected="Browse" + layout="topleft" + left_pad="5" + name="set_cache" + top_delta="-1" + width="100"> + <button.commit_callback + function="Pref.SetCache" /> + </button> + <button + follows="left|top" + height="22" + label="Reset" + label_selected="Set" + layout="topleft" + left_pad="3" + name="reset_cache" + top_delta="0" + width="100"> + <button.commit_callback + function="Pref.ResetCache" /> + </button> + + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="80" + name="Cache location" + top_delta="20" + width="300" + text_color="LtGray_50"> + Cache location + </text> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="30" + name="Web:" + top_pad="5" + width="300"> + Web: + </text> + <radio_group + control_name="UseExternalBrowser" + draw_border="false" + follows="top|left" + height="40" + layout="topleft" + left_delta="50" + name="use_external_browser" + top_pad="4" + width="480"> + <radio_item + height="20" + label="Use built-in browser" + layout="topleft" + left="0" + name="internal" + tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside [APP_NAME]." + top="0" + width="480" /> + <radio_item + height="20" + label="Use my browser (IE, Firefox)" + layout="topleft" + left_delta="0" + name="external" + tool_tip="Use the default system web browser for help, web links, etc. Not recommended if running full screen." + top_delta="20" + width="480" /> + </radio_group> + + <check_box + top_delta="4" + enabled="true" + follows="left|top" + height="16" + initial_value="false" + label="Web Proxy" + left_delta="0" + mouse_opaque="true" + name="web_proxy_enabled" + radio_style="false" + width="400" /> + <line_editor + control_name="BrowserProxyAddress" + enabled_control="BrowserProxyEnabled" + follows="left|top" + font="SansSerif" + height="20" + layout="topleft" + left_delta="1" + name="web_proxy_editor" + tool_tip="The name or IP address of the proxy you would like to use" + top_pad="4" + width="200" /> + <button + follows="left|top" + height="22" + enabled="false" + label="Browse" + label_selected="Browse" + layout="topleft" + left_pad="5" + name="set_proxy" + top_pad="-21" + width="100"> + <button.commit_callback + function="Pref.SetCache" /> + </button> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_delta="-203" + name="Proxy location" + top_delta="20" + width="300" + text_color="LtGray_50"> + Proxy location + </text></panel> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml new file mode 100644 index 0000000000..f5f9850a4e --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml @@ -0,0 +1,457 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + border="true" + follows="left|top|right|bottom" + height="408" + label="Audio & Video" + layout="topleft" + left="102" + name="Preference Media panel" + top="1" + width="517"> + <slider + control_name="AudioLevelMaster" + follows="left|top" + height="15" + increment="0.05" + initial_value="0.5" + label="Master Volume" + label_width="125" + layout="topleft" + left="30" + name="System Volume" + show_text="false" + top_pad="5" + volume="true" + width="425"> + <slider.commit_callback + function="Pref.setControlFalse" + parameter="MuteAudio" /> + </slider> + <button + control_name="MuteAudio" + follows="top|right" + height="16" + image_selected="icn_speaker-muted_dark.tga" + image_unselected="icn_speaker_dark.tga" + is_toggle="true" + layout="topleft" + left_pad="30" + name="mute_audio" + picture_style="true" + tab_stop="false" + top_delta="-1" + width="25" /> + <check_box + control_name="MuteWhenMinimized" + height="16" + initial_value="true" + label="Mute if minimized" + layout="topleft" + left="165" + name="mute_when_minimized" + top_pad="5" + width="215" /> + <slider + control_name="AudioLevelAmbient" + disabled_control="MuteAudio" + follows="left|topt" + height="15" + increment="0.05" + initial_value="0.5" + label="Ambient" + label_width="125" + layout="topleft" + left="30" + name="Wind Volume" + show_text="false" + top_pad="5" + volume="true" + width="300"> + <slider.commit_callback + function="Pref.setControlFalse" + parameter="MuteAmbient" /> + </slider> + <button + control_name="MuteAmbient" + disabled_control="MuteAudio" + follows="top|right" + height="16" + image_selected="icn_speaker-muted_dark.tga" + image_unselected="icn_speaker_dark.tga" + is_toggle="true" + layout="topleft" + left_pad="30" + name="mute_wind" + picture_style="true" + tab_stop="false" + top_delta="-1" + width="25" /> + <slider + control_name="AudioLevelSFX" + disabled_control="MuteAudio" + follows="left|top" + height="15" + increment="0.05" + initial_value="0.5" + label="Sounds" + label_width="125" + layout="topleft" + left="30" + name="SFX Volume" + show_text="false" + top_pad="5" + volume="true" + width="300"> + <slider.commit_callback + function="Pref.setControlFalse" + parameter="MuteSounds" /> + </slider> + <button + control_name="MuteSounds" + disabled_control="MuteAudio" + follows="top|right" + height="16" + image_selected="icn_speaker-muted_dark.tga" + image_unselected="icn_speaker_dark.tga" + is_toggle="true" + layout="topleft" + left_pad="30" + name="mute_sfx" + picture_style="true" + tab_stop="false" + top_delta="-1" + width="25" /> + <slider + control_name="AudioLevelMedia" + disabled_control="MuteAudio" + follows="left|top" + height="15" + increment="0.05" + initial_value="0.5" + label="Media" + label_width="125" + layout="topleft" + left="30" + name="Media Volume" + show_text="false" + top_pad="5" + volume="true" + width="300"> + <slider.commit_callback + function="Pref.setControlFalse" + parameter="MuteMedia" /> + </slider> + <button + control_name="MuteMedia" + disabled_control="MuteAudio" + follows="top|right" + height="16" + image_selected="icn_speaker-muted_dark.tga" + image_unselected="icn_speaker_dark.tga" + is_toggle="true" + layout="topleft" + left_pad="30" + name="mute_media" + picture_style="true" + tab_stop="false" + top_delta="-1" + width="25" /> + <slider + control_name="AudioLevelUI" + disabled_control="MuteAudio" + follows="left|top" + height="15" + increment="0.05" + initial_value="0.5" + label="UI" + label_width="125" + layout="topleft" + left="30" + name="UI Volume" + show_text="false" + top_pad="5" + volume="true" + width="300"> + <slider.commit_callback + function="Pref.setControlFalse" + parameter="MuteUI" /> + </slider> + <button + control_name="MuteUI" + disabled_control="MuteAudio" + follows="top|right" + height="16" + image_selected="icn_speaker-muted_dark.tga" + image_unselected="icn_speaker_dark.tga" + is_toggle="true" + layout="topleft" + left_pad="30" + name="mute_ui" + picture_style="true" + tab_stop="false" + top_delta="-1" + width="25" /> + <slider + control_name="AudioLevelMusic" + disabled_control="MuteAudio" + follows="left|top" + height="15" + increment="0.05" + initial_value="0.5" + label="Music" + label_width="125" + layout="topleft" + left="30" + name="Music Volume" + show_text="false" + top_pad="5" + volume="true" + width="300"> + <slider.commit_callback + function="Pref.setControlFalse" + parameter="MuteMusic" /> + </slider> + <button + control_name="MuteMusic" + disabled_control="MuteAudio" + follows="top|right" + height="16" + image_selected="icn_speaker-muted_dark.tga" + image_unselected="icn_speaker_dark.tga" + is_toggle="true" + layout="topleft" + left_pad="30" + name="mute_music" + picture_style="true" + tab_stop="false" + top_delta="-1" + width="25" /> + <slider + control_name="AudioLevelVoice" + disabled_control="MuteAudio" + follows="left|top" + height="15" + increment="0.05" + initial_value="0.5" + label="Voice" + label_width="125" + layout="topleft" + left="30" + name="Voice Volume" + show_text="false" + top_pad="5" + volume="true" + width="300"> + <slider.commit_callback + function="Pref.setControlFalse" + parameter="MuteVoice" /> + </slider> + <button + control_name="MuteVoice" + disabled_control="MuteAudio" + follows="top|right" + height="16" + image_selected="icn_speaker-muted_dark.tga" + image_unselected="icn_speaker_dark.tga" + is_toggle="true" + layout="topleft" + left_pad="30" + name="mute_voice" + picture_style="true" + tab_stop="false" + top_delta="-1" + width="25" /> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="30" + name="Listen from" + top_pad="5" + width="100"> + Listen from: + </text> + <radio_group + enabled_control="EnableVoiceChat" + control_name="VoiceEarLocation" + draw_border="false" + height="40" + layout="topleft" + left_delta="50" + name="ear_location" + top_pad="0" + width="364"> + <radio_item + height="16" + label="Listen from camera position" + layout="topleft" + left="3" + name="0" + top="3" + width="315" /> + <radio_item + height="16" + label="Listen from avatar position" + layout="topleft" + left_delta="0" + name="1" + top_delta="16" + width="315" /> + </radio_group> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="30" + name="Sound out/in" + top_pad="2" + width="100"> + Sound out/in: + </text> + <button + enabled_control="EnableVoiceChat" + follows="left|top" + height="20" + label="Device Settings" + layout="topleft" + left_delta="55" + name="device_settings_btn" + top_pad="0" + width="155"> + <button.commit_callback + function="Floater.Show" + parameter="pref_voicedevicesettings" /> + </button> + <panel.string + name="default_text"> + Default + </panel.string> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="30" + name="Input device (microphone):" + top_pad="5" + width="200"> + Input device (microphone): + </text> + <combo_box + height="18" + layout="topleft" + left_delta="70" + max_chars="128" + name="voice_input_device" + top_pad="2" + width="225" /> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="30" + name="Output device (speakers):" + top_pad="5" + width="200"> + Output device (speakers): + </text> + <combo_box + height="18" + layout="topleft" + left_delta="70" + max_chars="128" + name="voice_output_device" + top_pad="2" + width="225" /> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="30" + name="Input level:" + top_pad="10" + width="200"> + Input Level + </text> + <slider_bar + follows="left|top" + height="17" + increment="0.05" + initial_value="1.0" + layout="topleft" + left_delta="125" + max_val="2" + name="mic_volume_slider" + tool_tip="Change the volume using this slider" + top_delta="-1" + width="175" /> + <text + type="string" + length="1" + follows="left|top" + height="20" + layout="topleft" + left_pad="5" + name="wait_text" + top_delta="1" + width="200"> + Please wait + </text> + <locate + height="20" + layout="topleft" + left_delta="0" + name="bar0" + top_delta="5" + width="20" /> + <locate + height="20" + layout="topleft" + left_pad="2" + name="bar1" + top_delta="0" + width="20" /> + <locate + height="20" + layout="topleft" + left_pad="2" + name="bar2" + top_delta="0" + width="20" /> + <locate + height="20" + layout="topleft" + left_pad="2" + name="bar3" + top_delta="0" + width="20" /> + <locate + height="20" + layout="topleft" + left_pad="2" + name="bar4" + top_delta="0" + width="20" /> + <text + type="string" + height="40" + left="30" + name="voice_intro_text1" + top_pad="-4" + width="480" + word_wrap="true"> + Adjust the slider to control how loud you sound to other Residents. To test the input level, simply speak into your microphone. + </text> + + +</panel> diff --git a/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml index 8078579806..888b4eaf7c 100644 --- a/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml +++ b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <flat_list_view allow_select="true" - color="DkGray2" + color="PanelFocusBackgroundColor" item_pad="0" keep_one_selected="true" multi_select="false" diff --git a/indra/newview/skins/default/xui/en/widgets/textbase.xml b/indra/newview/skins/default/xui/en/widgets/textbase.xml index e5dc022633..6dd92ea34b 100644 --- a/indra/newview/skins/default/xui/en/widgets/textbase.xml +++ b/indra/newview/skins/default/xui/en/widgets/textbase.xml @@ -1,4 +1,2 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<textbase allow_scroll="true" - h_pad="5" - v_pad="5"/> +<textbase/> |