diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
62 files changed, 334 insertions, 120 deletions
diff --git a/indra/newview/skins/default/xui/en/accordion_drag.xml b/indra/newview/skins/default/xui/en/accordion_drag.xml index 94839a7593..e8a705e744 100644 --- a/indra/newview/skins/default/xui/en/accordion_drag.xml +++ b/indra/newview/skins/default/xui/en/accordion_drag.xml @@ -4,5 +4,5 @@ height="5" left="50" top="50" - follows="left|bottom|right" background_visible="true" label="splitter_drag" title=""> + follows="left|bottom|right" background_visible="true" label="splitter_drag" title="" translate="false"> </panel> diff --git a/indra/newview/skins/default/xui/en/accordion_parent.xml b/indra/newview/skins/default/xui/en/accordion_parent.xml index ea34bac0a7..e17a0dd351 100644 --- a/indra/newview/skins/default/xui/en/accordion_parent.xml +++ b/indra/newview/skins/default/xui/en/accordion_parent.xml @@ -3,5 +3,6 @@ background_visible="true" label="splitter_parent" title="" + translate="false" > </panel> diff --git a/indra/newview/skins/default/xui/en/favorites_bar_button.xml b/indra/newview/skins/default/xui/en/favorites_bar_button.xml index 6adf2a5950..b365040c20 100644 --- a/indra/newview/skins/default/xui/en/favorites_bar_button.xml +++ b/indra/newview/skins/default/xui/en/favorites_bar_button.xml @@ -10,6 +10,8 @@ image_selected="transparent.j2c" image_unselected="transparent.j2c" image_pressed="Favorite_Link_Over" + image_hover_selected="Favorite_Link_Over" + image_hover_unselected="Favorite_Link_Over" hover_glow_amount="0.15" label_shadow="false" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml index 0b48ba9321..7236351f2e 100644 --- a/indra/newview/skins/default/xui/en/floater_aaa.xml +++ b/indra/newview/skins/default/xui/en/floater_aaa.xml @@ -17,8 +17,9 @@ save_visibility="true" single_instance="true" width="320"> - <string name="nudge_parabuild">Nudge 1</string> - <string name="test_the_vlt">This string CHANGE is extracted.</string> + <string name="nudge_parabuild" translate="false">Nudge 1</string> + <string name="test_the_vlt">This string CHANGE2 is extracted.</string> + <string name="testing_eli">Just a test. change here. more change.</string> <chat_history allow_html="true" bg_readonly_color="ChatHistoryBgColor" @@ -34,6 +35,7 @@ parse_highlights="true" text_color="ChatHistoryTextColor" text_readonly_color="ChatHistoryTextColor" + translate="false" width="320"> Really long line that is long enough to wrap once with jyg descenders. Really long line that is long enough to wrap once with jyg descenders. diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index b6443c4c21..bc67621dfd 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -21,7 +21,7 @@ Built with [COMPILER] version [COMPILER_VERSION] </floater.string> <floater.string name="AboutPosition"> -You are at [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] in [REGION] located at [HOSTNAME] ([HOSTIP]) +You are at [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] in [REGION] located at <nolink>[HOSTNAME]</nolink> ([HOSTIP]) [SERVER_VERSION] [[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]] @@ -91,7 +91,7 @@ Packets Lost: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number left="10" top_pad="5" height="25" - width="160" /> + width="180" /> </panel> <panel border="true" diff --git a/indra/newview/skins/default/xui/en/floater_beacons.xml b/indra/newview/skins/default/xui/en/floater_beacons.xml index c8f6c613af..4fc2b698d8 100644 --- a/indra/newview/skins/default/xui/en/floater_beacons.xml +++ b/indra/newview/skins/default/xui/en/floater_beacons.xml @@ -25,7 +25,7 @@ name="label_show" text_color="White" type="string"> - Show: + Show : </text> <check_box control_name="renderbeacons" @@ -117,6 +117,7 @@ <check_box control_name="soundsbeacon" height="16" + left="0" label="Sound sources" layout="topleft" name="sounds" > diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml index 8f67f564a2..703a02d995 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml @@ -114,6 +114,7 @@ </text> <line_editor type="string" + max_length="10" halign="right" font="SansSerifMedium" select_on_focus="true" diff --git a/indra/newview/skins/default/xui/en/floater_color_picker.xml b/indra/newview/skins/default/xui/en/floater_color_picker.xml index 9009c60a99..2fa112af8c 100644 --- a/indra/newview/skins/default/xui/en/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/en/floater_color_picker.xml @@ -170,7 +170,7 @@ image_unselected="eye_button_inactive.tga" layout="topleft" left_pad="50" - name="Pipette" + name="color_pipette" width="28" /> <button follows="right|bottom" diff --git a/indra/newview/skins/default/xui/en/floater_help_browser.xml b/indra/newview/skins/default/xui/en/floater_help_browser.xml index e83bc1555c..be32e917e5 100644 --- a/indra/newview/skins/default/xui/en/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/en/floater_help_browser.xml @@ -4,8 +4,8 @@ can_resize="true" height="480" layout="topleft" - min_height="140" - min_width="467" + min_height="150" + min_width="500" name="floater_help_browser" help_topic="floater_help_browser" save_rect="true" @@ -13,37 +13,44 @@ title="HELP BROWSER" width="620"> <floater.string - name="home_page_url"> - http://www.secondlife.com + name="loading_text"> + Loading... </floater.string> <floater.string - name="support_page_url"> - http://support.secondlife.com + name="done_text"> </floater.string> <layout_stack bottom="480" follows="left|right|top|bottom" layout="topleft" - left="10" + left="5" name="stack1" top="20" - width="600"> + width="610"> <layout_panel - height="1" layout="topleft" left_delta="0" - name="external_controls" top_delta="0" + name="external_controls" user_resize="false" width="590"> <web_browser - bottom="-4" + bottom="-11" follows="left|right|top|bottom" layout="topleft" left="0" name="browser" top="0" + height="500" width="590" /> + <text + follows="bottom|left" + height="16" + layout="topleft" + left_delta="2" + name="status_text" + top_pad="5" + width="150" /> </layout_panel> </layout_stack> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml index 1d51d19a4a..bd25288a9e 100644 --- a/indra/newview/skins/default/xui/en/floater_im_container.xml +++ b/indra/newview/skins/default/xui/en/floater_im_container.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <multi_floater - can_minimize="false" + can_close="false" + can_minimize="true" can_resize="true" height="390" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index 613530b7aa..9aaa660574 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -11,8 +11,8 @@ can_dock="false" can_minimize="true" can_close="true" - visible="true" - width="360" + visible="false" + width="440" can_resize="true" min_width="250" min_height="190"> @@ -20,7 +20,7 @@ animate="false" follows="all" height="320" - width="360" + width="440" layout="topleft" orientation="horizontal" name="im_panels" @@ -38,7 +38,7 @@ left="0" top="0" height="200" - width="245" + width="325" user_resize="true"> <button height="20" @@ -65,7 +65,7 @@ parse_highlights="true" allow_html="true" left="1" - width="240"> + width="320"> </chat_history> <line_editor bottom="0" @@ -75,7 +75,7 @@ label="To" layout="bottomleft" name="chat_editor" - width="240"> + width="320"> </line_editor> </layout_panel> </layout_stack> diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml index 3a5ceed5fb..1903e7c714 100644 --- a/indra/newview/skins/default/xui/en/floater_map.xml +++ b/indra/newview/skins/default/xui/en/floater_map.xml @@ -1,14 +1,17 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater legacy_header_height="18" - can_minimize="false" + can_minimize="true" can_resize="true" + center_horiz="true" + center_vert="true" follows="top|right" - height="225" + height="218" layout="topleft" min_height="60" min_width="174" name="Map" + title="Mini Map" help_topic="map" save_rect="true" save_visibility="true" @@ -52,116 +55,116 @@ </floater.string> <net_map bg_color="NetMapBackgroundColor" - bottom="225" follows="top|left|bottom|right" layout="topleft" left="0" mouse_opaque="false" name="Net Map" - right="198" - top="2" /> + width="200" + height="200" + top="18"/> <text type="string" length="1" - bottom="225" + bottom="218" label="N" layout="topleft" left="0" name="floater_map_north" right="10" text_color="1 1 1 0.7" - top="215"> + top="209"> N </text> <text type="string" length="1" - bottom="225" + bottom="218" label="E" layout="topleft" left="0" name="floater_map_east" right="10" text_color="1 1 1 0.7" - top="215"> + top="209"> E </text> <text type="string" length="1" - bottom="225" + bottom="205" label="W" layout="topleft" left="0" name="floater_map_west" right="11" text_color="1 1 1 0.7" - top="215"> + top="195"> W </text> <text type="string" length="1" - bottom="225" + bottom="218" label="S" layout="topleft" left="0" name="floater_map_south" right="10" text_color="1 1 1 0.7" - top="215"> + top="209"> S </text> <text type="string" length="1" - bottom="225" + bottom="218" label="SE" layout="topleft" left="0" name="floater_map_southeast" right="20" text_color="1 1 1 0.7" - top="215"> + top="209"> SE </text> <text type="string" length="1" - bottom="225" + bottom="218" label="NE" layout="topleft" left="0" name="floater_map_northeast" right="20" text_color="1 1 1 0.7" - top="215"> + top="209"> NE </text> <text type="string" length="1" - bottom="225" + bottom="218" label="SW" layout="topleft" left="0" name="floater_map_southwest" right="20" text_color="1 1 1 0.7" - top="215"> + top="209"> SW </text> <text type="string" length="1" - bottom="225" + bottom="218" label="NW" layout="topleft" left="0" name="floater_map_northwest" right="20" text_color="1 1 1 0.7" - top="215"> + top="209"> NW </text> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml index aa219b9615..ac0fca9cce 100644 --- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml @@ -52,6 +52,7 @@ left_pad="5" name="reporter_field" top_delta="0" + translate="false" use_ellipses="true" width="200"> Loremipsum Dolorsitamut Longnamez @@ -153,6 +154,7 @@ left_pad="6" name="object_name" top_delta="0" + translate="false" use_ellipses="true" width="185"> Consetetur Sadipscing @@ -180,6 +182,7 @@ left_pad="6" name="owner_name" top_delta="0" + translate="false" use_ellipses="true" width="185"> Hendrerit Vulputate Kamawashi Longname diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml index b0bb282abd..775e7d66f7 100644 --- a/indra/newview/skins/default/xui/en/floater_search.xml +++ b/indra/newview/skins/default/xui/en/floater_search.xml @@ -2,9 +2,9 @@ <floater legacy_header_height="13" can_resize="true" - height="646" + height="546" layout="topleft" - min_height="646" + min_height="546" min_width="670" name="floater_search" help_topic="floater_search" @@ -21,7 +21,7 @@ Done </floater.string> <layout_stack - bottom="641" + bottom="541" follows="left|right|top|bottom" layout="topleft" left="10" @@ -42,7 +42,7 @@ left="0" name="browser" top="0" - height="600" + height="500" width="650" /> <text follows="bottom|left" diff --git a/indra/newview/skins/default/xui/en/floater_test_button.xml b/indra/newview/skins/default/xui/en/floater_test_button.xml index 8c6ad5c0f7..bf0a774e76 100644 --- a/indra/newview/skins/default/xui/en/floater_test_button.xml +++ b/indra/newview/skins/default/xui/en/floater_test_button.xml @@ -6,6 +6,7 @@ layout="topleft" name="floater_test_button" help_topic="floater_test_button" + translate="false" width="500"> <button height="23" diff --git a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml index 9977e85a9d..1935edfcc1 100644 --- a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml +++ b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml @@ -6,6 +6,7 @@ layout="topleft" name="floater_test_checkbox" help_topic="floater_test_checkbox" + translate="false" width="400"> <check_box control_name="ShowStartLocation" diff --git a/indra/newview/skins/default/xui/en/floater_test_combobox.xml b/indra/newview/skins/default/xui/en/floater_test_combobox.xml index 317d8f5ba8..45e2e34da7 100644 --- a/indra/newview/skins/default/xui/en/floater_test_combobox.xml +++ b/indra/newview/skins/default/xui/en/floater_test_combobox.xml @@ -6,6 +6,7 @@ layout="topleft" name="floater_test_combobox" help_topic="floater_test_combobox" + translate="false" width="400"> <text type="string" 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 9143048aeb..0f5c5f2be0 100644 --- a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml +++ b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml @@ -7,6 +7,7 @@ name="floater_test_inspectors" help_topic="floater_test_inspectors" title="TEST INSPECTORS" + translate="false" width="400"> <text height="20" diff --git a/indra/newview/skins/default/xui/en/floater_test_layout.xml b/indra/newview/skins/default/xui/en/floater_test_layout.xml index c6acb7c96e..94f7e0b798 100644 --- a/indra/newview/skins/default/xui/en/floater_test_layout.xml +++ b/indra/newview/skins/default/xui/en/floater_test_layout.xml @@ -6,6 +6,7 @@ layout="topleft" name="floater_test_layout" help_topic="floater_test_layout" + translate="false" width="500"> <text type="string" diff --git a/indra/newview/skins/default/xui/en/floater_test_line_editor.xml b/indra/newview/skins/default/xui/en/floater_test_line_editor.xml index fe6ec91709..2894ad2a32 100644 --- a/indra/newview/skins/default/xui/en/floater_test_line_editor.xml +++ b/indra/newview/skins/default/xui/en/floater_test_line_editor.xml @@ -6,6 +6,7 @@ layout="topleft" name="floater_test_line_editor" help_topic="floater_test_line_editor" + translate="false" width="400"> <line_editor height="20" diff --git a/indra/newview/skins/default/xui/en/floater_test_list_view.xml b/indra/newview/skins/default/xui/en/floater_test_list_view.xml index 247c705687..32ccc31dfd 100644 --- a/indra/newview/skins/default/xui/en/floater_test_list_view.xml +++ b/indra/newview/skins/default/xui/en/floater_test_list_view.xml @@ -6,6 +6,7 @@ layout="topleft" name="floater_test_list_view" help_topic="floater_test_list_view" + translate="false" width="400"> <!-- intentionally empty --> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml b/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml index c6b4cca6b9..f4a50ecc96 100644 --- a/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml @@ -6,6 +6,7 @@ layout="topleft" name="floater_test_navigation_bar" help_topic="floater_test_navigation_bar" + translate="false" width="900"> <panel name="navigation_bar" diff --git a/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml b/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml index 7ef2d97cdc..db14ecae83 100644 --- a/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml +++ b/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml @@ -6,6 +6,7 @@ layout="topleft" name="floater_test_radiogroup" help_topic="floater_test_radiogroup" + translate="false" width="400"> <radio_group height="54" diff --git a/indra/newview/skins/default/xui/en/floater_test_slider.xml b/indra/newview/skins/default/xui/en/floater_test_slider.xml index 85d8bb2bb1..20bd555a03 100644 --- a/indra/newview/skins/default/xui/en/floater_test_slider.xml +++ b/indra/newview/skins/default/xui/en/floater_test_slider.xml @@ -6,6 +6,7 @@ layout="topleft" name="floater_test_slider" help_topic="floater_test_slider" + translate="false" width="450"> <slider height="20" diff --git a/indra/newview/skins/default/xui/en/floater_test_spinner.xml b/indra/newview/skins/default/xui/en/floater_test_spinner.xml index 3c44a4884d..acd49aa492 100644 --- a/indra/newview/skins/default/xui/en/floater_test_spinner.xml +++ b/indra/newview/skins/default/xui/en/floater_test_spinner.xml @@ -6,6 +6,7 @@ layout="topleft" name="floater_test_spinner" help_topic="floater_test_spinner" + translate="false" width="450"> <spinner height="32" diff --git a/indra/newview/skins/default/xui/en/floater_test_text_editor.xml b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml index 8be0c28c5c..dc8f00d5f3 100644 --- a/indra/newview/skins/default/xui/en/floater_test_text_editor.xml +++ b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml @@ -5,6 +5,7 @@ height="600" layout="topleft" name="floater_test_text_editor" + translate="false" width="800"> <text_editor height="50" diff --git a/indra/newview/skins/default/xui/en/floater_test_textbox.xml b/indra/newview/skins/default/xui/en/floater_test_textbox.xml index 8fc2677cbe..2df9bb35fe 100644 --- a/indra/newview/skins/default/xui/en/floater_test_textbox.xml +++ b/indra/newview/skins/default/xui/en/floater_test_textbox.xml @@ -6,6 +6,7 @@ layout="topleft" name="floater_test_textbox" help_topic="floater_test_textbox" + translate="false" width="800"> <text type="string" diff --git a/indra/newview/skins/default/xui/en/floater_test_widgets.xml b/indra/newview/skins/default/xui/en/floater_test_widgets.xml index 2f88c234cc..447bd7f599 100644 --- a/indra/newview/skins/default/xui/en/floater_test_widgets.xml +++ b/indra/newview/skins/default/xui/en/floater_test_widgets.xml @@ -25,6 +25,7 @@ layout="topleft" name="floater_test_widgets" help_topic="floater_test_widgets" + translate="false" width="850"> <!-- Strings are used by C++ code for localization. They are not visible diff --git a/indra/newview/skins/default/xui/en/floater_ui_preview.xml b/indra/newview/skins/default/xui/en/floater_ui_preview.xml index 8b2136c2dc..e86cb23c1e 100644 --- a/indra/newview/skins/default/xui/en/floater_ui_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_ui_preview.xml @@ -10,6 +10,7 @@ help_topic="gui_preview_tool" single_instance="true" title="XUI PREVIEW TOOL" + translate="false" width="750"> <panel bottom="640" 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 f473a51ff6..c4411db8c5 100644 --- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml @@ -56,7 +56,7 @@ height="18" default_icon_name="Generic_Person" layout="topleft" - left="0" + left="5" name="user_icon" top="0" width="18" /> @@ -78,6 +78,7 @@ follows="top|right" height="16" layout="topleft" + right="-3" name="speaking_indicator" left_pad="5" visible="true" diff --git a/indra/newview/skins/default/xui/en/menu_attachment_other.xml b/indra/newview/skins/default/xui/en/menu_attachment_other.xml index 5b94645b60..c5b31c7f63 100644 --- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml +++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml @@ -30,6 +30,8 @@ name="Call"> <menu_item_call.on_click function="Avatar.Call" /> + <menu_item_call.on_enable + function="Avatar.EnableCall" /> </menu_item_call> <menu_item_call label="Invite to Group" diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml index 0ad41546d2..ac9101cfd9 100644 --- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml @@ -30,6 +30,8 @@ name="Call"> <menu_item_call.on_click function="Avatar.Call" /> + <menu_item_call.on_enable + function="Avatar.EnableCall" /> </menu_item_call> <menu_item_call label="Invite to Group" diff --git a/indra/newview/skins/default/xui/en/menu_gesture_gear.xml b/indra/newview/skins/default/xui/en/menu_gesture_gear.xml index d96f3c5494..649f0edff7 100644 --- a/indra/newview/skins/default/xui/en/menu_gesture_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_gesture_gear.xml @@ -62,14 +62,4 @@ function="Gesture.EnableAction" parameter="edit_gesture" /> </menu_item_call> - <menu_item_call - label="Inspect" - layout="topleft" - name="inspect"> - <on_click - function="Gesture.Action.ShowPreview" /> - <on_enable - function="Gesture.EnableAction" - parameter="inspect" /> - </menu_item_call> </menu> diff --git a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml index dde92f23b6..85ec174829 100644 --- a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml @@ -32,6 +32,8 @@ name="call"> <menu_item_call.on_click function="InspectAvatar.Call"/> + <menu_item_call.on_enable + function="InspectAvatar.Gear.EnableCall"/> </menu_item_call> <menu_item_call label="Teleport" diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index a0dec346a4..bbe6892b27 100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -10,6 +10,7 @@ <menu create_jump_keys="true" label="Me" + tear_off="true" name="File"> <menu_item_call label="Preferences" @@ -39,6 +40,7 @@ <menu create_jump_keys="true" label="Help" + tear_off="true" name="Help"> <menu_item_call label="[SECOND_LIFE] Help" @@ -194,6 +196,7 @@ <menu_item_call label="Textbox" name="Textbox" + translate="false" shortcut="control|1"> <menu_item_call.on_click function="Floater.Show" @@ -202,6 +205,7 @@ <menu_item_call label="Text Editor" name="Text Editor" + translate="false" shortcut="control|2"> <menu_item_call.on_click function="Floater.Show" @@ -210,6 +214,7 @@ <menu_item_call label="Widgets" name="Widgets" + translate="false" shortcut="control|shift|T"> <menu_item_call.on_click function="Floater.Show" @@ -217,6 +222,7 @@ </menu_item_call> <menu_item_call label="Inspectors" + translate="false" name="Inspectors"> <menu_item_call.on_click function="Floater.Show" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 960da7a274..636db2b59b 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -244,6 +244,16 @@ Save all changes to clothing/body parts? <notification icon="alertmodal.tga" + name="FriendsAndGroupsOnly" + type="alertmodal"> + Non-friends won't know that you've choosen to ignore their calls and instant messages. + <usetemplate + name="okbutton" + yestext="Yes"/> + </notification> + + <notification + icon="alertmodal.tga" name="GrantModifyRights" type="alertmodal"> Granting modify rights to another Resident allows them to change, delete or take ANY objects you may have in-world. Be VERY careful when handing out this permission. @@ -2931,7 +2941,6 @@ Chat and instant messages will be hidden. Instant messages will get your Busy mo type="alert"> You have reached your maximum number of groups. Please leave another group before joining this one, or decline the offer. [NAME] has invited you to join a group as a member. -[INVITE] <usetemplate name="okcancelbuttons" notext="Decline" @@ -3078,7 +3087,7 @@ Join me in [REGION] icon="alertmodal.tga" name="TeleportFromLandmark" type="alertmodal"> -Are you sure you want to teleport to [LOCATION]? +Are you sure you want to teleport to <nolink>[LOCATION]</nolink>? <usetemplate ignoretext="Confirm that I want to teleport to a landmark" name="okcancelignore" @@ -3841,7 +3850,7 @@ Are you sure you want to quit? type="alertmodal"> Use this tool to report violations of the [http://secondlife.com/corporate/tos.php Terms of Service] and [http://secondlife.com/corporate/cs.php Community Standards]. -All reported abuses are investigated and resolved. You can view the resolution by reading the [http://secondlife.com/support/incidentreport.php Incident Report]. +All reported abuses are investigated and resolved. <unique/> </notification> @@ -5147,7 +5156,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you th <notification icon="notify.tga" name="OfferFriendship" - type="alertmodal"> + type="offer"> [NAME] is offering friendship. [MESSAGE] @@ -5162,10 +5171,6 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you th index="1" name="Decline" text="Decline"/> - <button - index="2" - name="Send IM" - text="Send IM"/> </form> </notification> 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 615ade99a2..c605975c8e 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 @@ -65,28 +65,18 @@ height="15" layout="topleft" left_pad="5" + right="-72" name="last_interaction" text_color="LtGray_50" value="0s" width="24" /> - <output_monitor - auto_update="true" - follows="right" - draw_border="false" - height="16" - layout="topleft" - left_pad="5" - mouse_opaque="true" - name="speaking_indicator" - visible="true" - width="20" /> <button follows="right" height="16" image_pressed="Info_Press" image_unselected="Info_Over" left_pad="3" - right="-31" + right="-53" name="info_btn" top_delta="-2" width="16" /> @@ -96,9 +86,21 @@ image_overlay="ForwardArrow_Off" layout="topleft" left_pad="5" - right="-3" + right="-28" name="profile_btn" tool_tip="View profile" top_delta="-2" width="20" /> + <output_monitor + auto_update="true" + follows="right" + draw_border="false" + height="16" + layout="topleft" + left_pad="5" + right="-3" + mouse_opaque="true" + name="speaking_indicator" + visible="true" + width="20" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml index 39170b90ca..072ea882e6 100644 --- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml @@ -29,7 +29,7 @@ text_color="white" top="5" width="250"> - Blocked List + Block List </text> <scroll_list follows="all" diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index d3db9fd531..aad55685d2 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -87,7 +87,7 @@ image_name="spacer24.tga" layout="topleft" left="0" - name="DUMMY" + name="after_speak_panel" min_width="3" top="0" width="3"/> @@ -127,7 +127,7 @@ layout="topleft" left="0" min_width="3" - name="DUMMY" + name="after_gesture_panel" top="0" width="3"/> <layout_panel @@ -169,7 +169,7 @@ layout="topleft" left="0" min_width="3" - name="DUMMY" + name="after_movement_panel" top="0" width="3"/> <layout_panel @@ -212,7 +212,7 @@ layout="topleft" left="0" min_width="3" - name="DUMMY" + name="after_cam_panel" top="0" width="3"/> <layout_panel @@ -317,6 +317,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. layout="topleft" left="0" min_width="4" + name="DUMMY" top="0" width="5"/> <layout_panel @@ -416,7 +417,6 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well name="Unread" image_overlay="Notices_Unread" image_overlay_alignment="center" - pad_right="15" tool_tip="Notifications" width="34" > <button.init_callback diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml new file mode 100644 index 0000000000..6e9476f814 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml @@ -0,0 +1,95 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + default_tab_group="2" + mouse_opaque="true" + background_visible="true" + bg_alpha_color="DkGray" + bg_opaque_color="DkGray" + follows="left|bottom|right" + height="33" + layout="topleft" + left="0" + name="bottom_tray_lite" + tab_stop="true" + top="28" + chrome="true" + border_visible="false" + visible="false" + width="1000"> + <layout_stack + mouse_opaque="false" + border_size="0" + clip="false" + follows="all" + height="28" + layout="topleft" + left="0" + name="toolbar_stack_lite" + orientation="horizontal" + top="0" + width="1000"> + <icon + auto_resize="false" + follows="left|right" + height="10" + image_name="spacer24.tga" + layout="topleft" + min_width="2" + left="0" + top="0" + width="2" /> + <layout_panel + mouse_opaque="false" + auto_resize="true" + follows="left|right" + height="28" + layout="topleft" + left="0" + min_height="23" + width="310" + top="4" + min_width="188" + name="chat_bar" + user_resize="false" + filename="panel_nearby_chat_bar.xml" /> + <layout_panel + mouse_opaque="false" + auto_resize="false" + follows="right" + height="28" + layout="topleft" + min_height="28" + width="82" + top_delta="0" + min_width="52" + name="gesture_panel" + user_resize="false"> + <gesture_combo_list + follows="left|right" + height="23" + label="Gesture" + layout="topleft" + name="Gesture" + left="0" + top="5" + width="82" + tool_tip="Shows/hides gestures"> + <gesture_combo_list.combo_button + pad_right="10" + use_ellipses="true" /> + </gesture_combo_list> + </layout_panel> + <icon + auto_resize="false" + color="0 0 0 0" + follows="left|right" + height="10" + image_name="spacer24.tga" + layout="topleft" + left="0" + min_width="3" + name="after_gesture_panel" + top="0" + width="3"/> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml index 96185bad56..618167181f 100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml @@ -43,17 +43,20 @@ Hover your mouse over the options for more help. height="200" layout="topleft" left="0" - right="-1" name="visible_members" top_pad="2"> <name_list.columns label="Member" name="name" - relative_width="0.6" /> + relative_width="0.4" /> <name_list.columns label="Title" name="title" relative_width="0.4" /> + <name_list.columns + label="Status" + name="status" + relative_width="0.2" /> </name_list> <text follows="left|top|right" diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml index 4e017819c1..9727c54c6b 100644 --- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml @@ -51,9 +51,9 @@ background_visible="true" font="SansSerifHuge" height="20" left_pad="5" - text_color="white" + text_color="white" top="3" - use_ellipses="true" + use_ellipses="true" width="270" follows="top|left" word_wrap="true" @@ -77,10 +77,11 @@ background_visible="true" layout="topleft" left="10" name="insignia" + no_commit_on_selection="true" tool_tip="Click to choose a picture" top_pad="5" width="100" /> - <text + <text font="SansSerifSmall" text_color="White_50" width="190" @@ -152,7 +153,7 @@ background_visible="true" follows="all" layout="topleft" name="groups_accordion"> - <accordion_tab + <accordion_tab expanded="true" layout="topleft" name="group_general_tab" @@ -230,7 +231,7 @@ background_visible="true" top="0" name="btn_refresh" width="23" /> - <button + <button follows="bottom|left" height="18" image_selected="AddItem_Press" @@ -255,16 +256,16 @@ background_visible="true" follows="bottom|left" label="Chat" name="btn_chat" - left_pad="2" + left_pad="2" height="23" top_delta="-3" width="60" /> - <button + <button follows="bottom|left" left_pad="2" height="23" name="btn_call" - label="Group Call" + label="Group Call" layout="topleft" tool_tip="Call this group" width="95" /> 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 c243d08b97..b674b39d9b 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 @@ -36,6 +36,7 @@ top="2" width="20" /> <text + allow_html="false" follows="left|right" font="SansSerifSmall" height="15" diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml index a4249ce492..f19057cae3 100644 --- a/indra/newview/skins/default/xui/en/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml @@ -50,6 +50,18 @@ Select multiple Members by holding the Ctrl key and clicking on their names. </panel.string> + <panel.string + name="power_folder_icon" translate="false"> + Inv_FolderClosed + </panel.string> + <panel.string + name="power_all_have_icon" translate="false"> + Checkbox_On + </panel.string> + <panel.string + name="power_partial_icon" translate="false"> + Checkbox_Off + </panel.string> <filter_editor layout="topleft" top="5" @@ -130,15 +142,15 @@ including the Everyone and Owner Roles. The 'Everyone' and 'Owners' Roles are special and can't be deleted. </panel.string> <panel.string - name="power_folder_icon"> + name="power_folder_icon" translate="false"> Inv_FolderClosed </panel.string> <panel.string - name="power_all_have_icon"> + name="power_all_have_icon" translate="false"> Checkbox_On </panel.string> <panel.string - name="power_partial_icon"> + name="power_partial_icon" translate="false"> Checkbox_Off </panel.string> <filter_editor @@ -213,15 +225,15 @@ including the Everyone and Owner Roles. things in this group. There's a broad variety of Abilities. </panel.string> <panel.string - name="power_folder_icon"> + name="power_folder_icon" translate="false"> Inv_FolderClosed </panel.string> <panel.string - name="power_all_have_icon"> + name="power_all_have_icon" translate="false"> Checkbox_On </panel.string> <panel.string - name="power_partial_icon"> + name="power_partial_icon" translate="false"> Checkbox_Off </panel.string> <filter_editor @@ -317,7 +329,7 @@ things in this group. There's a broad variety of Abilities. width="285"> Allowed Abilities </text> - <scroll_list + <scroll_list draw_stripes="true" follows="left|top|right" height="150" @@ -330,8 +342,16 @@ things in this group. There's a broad variety of Abilities. top_pad="0"> <scroll_list.columns label="" + name="icon" + width="2" /> + <scroll_list.columns + label="" + name="checkbox" + width="20" /> + <scroll_list.columns + label="" name="action" - width="300" /> + width="270" /> </scroll_list> </panel> <panel diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml index 7204e57479..5a1bc32db0 100644 --- a/indra/newview/skins/default/xui/en/panel_instant_message.xml +++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml @@ -35,6 +35,16 @@ name="avatar_icon" top="3" width="18" /> + <group_icon + follows="right" + height="18" + default_icon_name="Generic_Group" + layout="topleft" + left="3" + mouse_opaque="false" + name="group_icon" + top="3" + width="18" /> <!--<icon follows="right" height="20" diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml index 67a4edbf32..396699ad6c 100644 --- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml @@ -229,6 +229,7 @@ value="Title:" width="290" /> <text + allow_html="false" follows="left|top" height="22" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 901cfaa365..c04414abbb 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -12,10 +12,10 @@ top="600" http://join.secondlife.com/ </panel.string> <panel.string - name="real_url"> + name="real_url" translate="false"> http://secondlife.com/app/login/ </panel.string> - <string name="reg_in_client_url"> + <string name="reg_in_client_url" translate="false"> http://secondlife.eniac15.lindenlab.com/reg-in-client/ </string> <panel.string diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml index aea3d18606..a0734d3dca 100644 --- a/indra/newview/skins/default/xui/en/panel_my_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml @@ -119,6 +119,7 @@ textbox.max_length="512" name="sl_description_edit" top_pad="-3" + translate="false" width="181" expanded_bg_visible="true" expanded_bg_color="DkGray"> @@ -172,6 +173,7 @@ textbox.max_length="512" name="fl_description_edit" top_pad="-3" + translate="false" width="181" expanded_bg_visible="true" expanded_bg_color="DkGray"> @@ -187,6 +189,7 @@ left="10" name="homepage_edit" top_pad="0" + translate="false" value="http://librarianavengers.org" width="300" word_wrap="false" @@ -209,6 +212,7 @@ layout="topleft" left="10" name="register_date" + translate="false" value="05/31/2376" width="300" word_wrap="true" /> @@ -241,6 +245,7 @@ left="10" name="acc_status_text" top_pad="0" + translate="false" width="300" word_wrap="true"> Resident. No payment info on file. @@ -295,6 +300,7 @@ left="7" name="sl_groups" top_pad="0" + translate="false" width="298" expanded_bg_visible="true" expanded_bg_color="DkGray"> diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml index df37f9973c..145a24b642 100644 --- a/indra/newview/skins/default/xui/en/panel_notification.xml +++ b/indra/newview/skins/default/xui/en/panel_notification.xml @@ -11,6 +11,7 @@ name="notification_panel" top="0" height="140" + translate="false" width="305"> <!-- THIS PANEL CONTROLS TOAST HEIGHT? --> <panel diff --git a/indra/newview/skins/default/xui/en/panel_notifications_channel.xml b/indra/newview/skins/default/xui/en/panel_notifications_channel.xml index 7b6c0f33da..16593751f7 100644 --- a/indra/newview/skins/default/xui/en/panel_notifications_channel.xml +++ b/indra/newview/skins/default/xui/en/panel_notifications_channel.xml @@ -3,6 +3,7 @@ height="100" layout="topleft" name="notifications_panel" + translate="false" width="100"> <layout_stack follows="left|right|top|bottom" diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml index 8895484326..710ca733e0 100644 --- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml @@ -45,7 +45,7 @@ left="0" top="0" mouse_opaque="true" - name="cof_accordionpanel" + name="cof_tab" start_folder="Current Outfit" width="313" /> </tab_container> diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml index 65ccd10cf0..7489988722 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml @@ -88,6 +88,7 @@ follows="all" height="100" width="280" + allow_html="true" hide_scrollbar="false" layout="topleft" left="10" diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml index 8fc2ae39f0..7ac771de27 100644 --- a/indra/newview/skins/default/xui/en/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml @@ -246,6 +246,7 @@ </layout_panel> </layout_stack> <text + allow_html="false" follows="left|top|right" font="SansSerifLarge" height="14" @@ -258,6 +259,7 @@ value="SampleRegion" width="290" /> <text + allow_html="false" follows="left|top|right" height="14" layout="topleft" 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 a0fcf59fc8..82821a1dfe 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -707,7 +707,8 @@ top_delta="16" width="315" /> </radio_group> - </panel> + </panel> + <button follows="left|bottom" height="23" @@ -717,7 +718,8 @@ left="10" name="Apply" top="383" - width="115"> + width="115" + > <button.commit_callback function="Pref.Apply" /> </button> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml index a8e24366f2..f7e3ede93c 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml @@ -78,19 +78,19 @@ top_pad="10" width="350" /> <check_box - control_name="MediaEnabled" + name="media_enabled" + control_name="AudioStreamingMedia" height="16" label="Media Enabled" layout="topleft" left="30" - name="media_enabled" top_pad="10" width="350"> <check_box.commit_callback function="Pref.MediaEnabled" /> </check_box> <check_box - enabled_control="MediaEnabled" + enabled_control="AudioStreamingMedia" control_name="ParcelMediaAutoPlayEnable" height="16" label="Allow Media to auto-play" @@ -102,7 +102,19 @@ <check_box.commit_callback function="Pref.ParcelMediaAutoPlayEnable" /> </check_box> - <text + <check_box + control_name="AudioStreamingMusic" + height="16" + label="Music Enabled" + layout="topleft" + left="30" + name="music_enabled" + top_pad="10" + width="350"> + <check_box.commit_callback + function="Pref.MusicEnabled" /> + </check_box> + <text type="string" length="1" follows="left|top" @@ -162,8 +174,7 @@ </text> <line_editor bottom="366" - control_name="InstantMessageLogFolder" - enabled="false" + control_name="InstantMessageLogPath" follows="top|left|right" halign="right" height="23" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml index 17ababe854..8723e0a832 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -279,7 +279,7 @@ width="480" /> <radio_item height="20" - label="Use my browser (IE, Firefox)" + label="Use my browser (IE, Firefox, Safari)" layout="topleft" left_delta="0" name="external" diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index 11cefa0224..27461571da 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -109,6 +109,7 @@ textbox.max_length="512" name="sl_description_edit" top_pad="-3" + translate="false" width="180" expanded_bg_visible="true" expanded_bg_color="DkGray"> @@ -152,6 +153,7 @@ textbox.max_length="512" name="fl_description_edit" top_pad="-3" + translate="false" width="180" expanded_bg_visible="true" expanded_bg_color="DkGray"> @@ -167,6 +169,7 @@ left="10" name="homepage_edit" top_pad="0" + translate="false" value="http://librarianavengers.org" width="300" word_wrap="false" @@ -189,6 +192,7 @@ layout="topleft" left="10" name="register_date" + translate="false" value="05/31/2376" width="300" word_wrap="true" /> @@ -221,6 +225,7 @@ left="10" name="acc_status_text" top_pad="0" + translate="false" width="300" word_wrap="true"> Resident. No payment info on file. @@ -275,6 +280,7 @@ left="7" name="sl_groups" top_pad="0" + translate="false" width="290" expanded_bg_visible="true" expanded_bg_color="DkGray"> diff --git a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml index 2822f7b841..5e74689c5a 100644 --- a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml +++ b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <!-- All our XML is utf-8 encoded. --> <panel + translate="false" name="sys_well_item" title="sys_well_item" visible="true" diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml index 4f40e00815..c5f3fcc27d 100644 --- a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml @@ -41,6 +41,7 @@ height="20" layout="topleft" left_pad="5" + allow_html="false" use_ellipses="true" name="region" text_color="white" diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml index d198237e5d..bfe3cce7d0 100644 --- a/indra/newview/skins/default/xui/en/panel_toast.xml +++ b/indra/newview/skins/default/xui/en/panel_toast.xml @@ -40,8 +40,9 @@ word_wrap="true" text_color="white" top="5" + translate="false" v_pad="5" - use_ellipses="true" + use_ellipses="true" width="260"> Toast text; </text> diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml index 51f85e65e2..74d8478551 100644 --- a/indra/newview/skins/default/xui/en/widgets/button.xml +++ b/indra/newview/skins/default/xui/en/widgets/button.xml @@ -7,6 +7,10 @@ image_selected="PushButton_Selected" image_disabled_selected="PushButton_Selected_Disabled" image_disabled="PushButton_Disabled" + image_left_pad="0" + image_right_pad="0" + image_top_pad="0" + image_bottom_pad="0" label_color="ButtonLabelColor" label_color_selected="ButtonLabelSelectedColor" label_color_disabled="ButtonLabelDisabledColor" diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml index 1c0a8ba7c5..70a58b8e03 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -96,7 +96,7 @@ name="damage_icon" width="14" height="13" - top="25" + top="21" left="2" follows="right|top" image_name="Parcel_Damage_Dark" |