diff options
Diffstat (limited to 'indra/newview/skins')
42 files changed, 702 insertions, 187 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index 7e22e17188..eb62c442db 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -2,7 +2,6 @@ <colors> <!-- Named Colors --> - <color name="EmphasisColor" value="0.38 0.694 0.573 1" /> @@ -90,6 +89,9 @@ name="AlertCautionTextColor" reference="Black" /> <color + name="AgentLinkColor" + reference="White" /> + <color name="AlertTextColor" value="0.58 0.66 0.84 1" /> <color diff --git a/indra/newview/skins/default/textures/icons/Info_Small.png b/indra/newview/skins/default/textures/icons/Info_Small.png Binary files differnew file mode 100644 index 0000000000..81078c32dc --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Info_Small.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 8a6e9486a2..f106796cd9 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -137,6 +137,7 @@ <texture name="Icon_Undock_Press" file_name="windows/Icon_Undock_Press.png" preload="false" /> <texture name="Info" file_name="icons/Info.png" preload="false" /> + <texture name="Info_Small" file_name="icons/Info_Small.png" preload="false" /> <texture name="Info_Off" file_name="navbar/Info_Off.png" preload="false" /> <texture name="Info_Press" file_name="navbar/Info_Press.png" preload="false" /> diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index c9e143bf95..dc6af79db5 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -80,6 +80,7 @@ label="Support" name="support_panel"> <text_editor + allow_html="true" follows="top|left" font="SansSerif" height="350" @@ -127,7 +128,7 @@ Thank you to the following residents for helping to ensure that this is the best It is a rare mind indeed that can render the hitherto non-existent blindingly obvious. The cry 'I could have thought of that' is a very popular and misleading one, for the fact is that they didn't, and a very significant and revealing fact it is too. --- Douglas Adams + -- Douglas Adams </text_editor> </panel> <panel diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index 5a285cdcb0..524495d83d 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -132,9 +132,6 @@ Go to World menu > About Land or select another parcel to show its details. Description: </text> <text_editor - bevel_style="in" - border_style="line" - border_thickness="1" follows="left|top|right" height="52" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml index bd0dac5ca1..62d40bc45f 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml @@ -483,7 +483,8 @@ sold with objects name="error_message" right="435" top="208" - width="215"> + width="215" + word_wrap="true"> Something ain't right. </text> <button @@ -583,7 +584,8 @@ sold with objects left="72" name="land_use_reason" right="435" - width="215"> + width="215" + word_wrap="true"> You hold 1309 m² of land. This parcel is 512 m² of land. </text> 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 be1278e8cc..a233f7f0fa 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -56,6 +56,8 @@ layout="topleft" max_length="2147483647" name="im_text" + parse_highlights="true" + allow_html="true" track_bottom="true" width="195" word_wrap="true"> diff --git a/indra/newview/skins/default/xui/en/floater_incoming_call.xml b/indra/newview/skins/default/xui/en/floater_incoming_call.xml index 8b271eb41e..bdce8fa4fc 100644 --- a/indra/newview/skins/default/xui/en/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/en/floater_incoming_call.xml @@ -33,7 +33,7 @@ <text_editor font="SansSerif" height="64" - hide_border="true" + border_visible="false" hide_scrollbar="true" layout="topleft" left="77" diff --git a/indra/newview/skins/default/xui/en/floater_inspect.xml b/indra/newview/skins/default/xui/en/floater_inspect.xml index 00b9f850ad..339604e658 100644 --- a/indra/newview/skins/default/xui/en/floater_inspect.xml +++ b/indra/newview/skins/default/xui/en/floater_inspect.xml @@ -55,7 +55,7 @@ top_pad="5" width="150"> <button.commit_callback - function="Inspect.OwnerProfilet" /> + function="Inspect.OwnerProfile" /> </button> <button follows="left|bottom" diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml index 70f9c19658..dc6a02efe1 100644 --- a/indra/newview/skins/default/xui/en/floater_map.xml +++ b/indra/newview/skins/default/xui/en/floater_map.xml @@ -81,7 +81,6 @@ left="0" name="floater_map_east" right="10" - text="E" text_color="1 1 1 0.7" top="215"> E @@ -95,7 +94,6 @@ left="0" name="floater_map_west" right="11" - text="W" text_color="1 1 1 0.7" top="215"> W @@ -109,7 +107,6 @@ left="0" name="floater_map_south" right="10" - text="S" text_color="1 1 1 0.7" top="215"> S @@ -123,7 +120,6 @@ left="0" name="floater_map_southeast" right="20" - text="SE" text_color="1 1 1 0.7" top="215"> SE @@ -137,7 +133,6 @@ left="0" name="floater_map_northeast" right="20" - text="NE" text_color="1 1 1 0.7" top="215"> NE @@ -151,7 +146,6 @@ left="0" name="floater_map_southwest" right="20" - text="SW" text_color="1 1 1 0.7" top="215"> SW @@ -165,7 +159,6 @@ left="0" name="floater_map_northwest" right="20" - text="NW" text_color="1 1 1 0.7" top="215"> NW 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 78f795b0e2..e851710ad8 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml @@ -39,6 +39,7 @@ height="320" max_length="2147483647" name="Chat History Editor" + parse_highlights="true" read_only="true" text_color="ChatHistoryTextColor" text_readonly_color="ChatHistoryTextColor" diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml index 1d7b7adca2..f90f2a81cf 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml @@ -74,6 +74,7 @@ left="4" max_length="65536" name="Notecard Editor" + allow_html="true" handle_edit_keys_directly="true" tab_group="1" top="46" 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 c7f5a1170f..abde4ba5fa 100644 --- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml @@ -33,6 +33,7 @@ length="1" follows="left|top" height="16" + font.name="SansSerif" font.style="BOLD" layout="topleft" left="10" @@ -58,6 +59,7 @@ length="1" follows="left|top" height="16" + font.name="SansSerif" font.style="BOLD" layout="topleft" left="10" @@ -83,6 +85,7 @@ length="1" follows="left|top" height="16" + font.name="SansSerif" font.style="BOLD" layout="topleft" left="10" @@ -130,6 +133,7 @@ length="1" follows="left|top" height="16" + font.name="SansSerif" font.style="BOLD" layout="topleft" left="48" @@ -155,6 +159,7 @@ length="1" follows="left|top" height="16" + font.name="SansSerif" font.style="BOLD" layout="topleft" left="48" @@ -345,6 +350,7 @@ length="1" follows="left|top" height="16" + font.name="SansSerif" font.style="BOLD" layout="topleft" left_delta="0" @@ -389,6 +395,7 @@ length="1" follows="left|top" height="16" + font.name="SansSerif" font.style="BOLD" layout="topleft" left="10" @@ -413,6 +420,7 @@ length="1" follows="left|top" height="16" + font.name="SansSerif" font.style="BOLD" layout="topleft" left_delta="0" @@ -437,6 +445,7 @@ length="1" follows="left|top" height="16" + font.name="SansSerif" font.style="BOLD" layout="topleft" left_delta="0" @@ -473,6 +482,7 @@ height="50" layout="topleft" left="10" + font.name="SansSerif" font.style="BOLD" name="incomplete_title" top_pad="5" diff --git a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml index c8b8c34f85..2085b74a55 100644 --- a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml @@ -16,6 +16,7 @@ layout="topleft" max_length="10000" name="Chat History Editor" + parse_highlights="true" width="420" word_wrap="true" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_telehub.xml b/indra/newview/skins/default/xui/en/floater_telehub.xml index b703b49b8b..95de27e0ea 100644 --- a/indra/newview/skins/default/xui/en/floater_telehub.xml +++ b/indra/newview/skins/default/xui/en/floater_telehub.xml @@ -88,7 +88,6 @@ </text> <scroll_list follows="left|top" - font="SansSerifSmall" height="60" layout="topleft" left_delta="0" 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 a1a271d0eb..2011f57d8b 100644 --- a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml +++ b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - can_resize="true" + can_resize="false" height="400" layout="topleft" name="floater_test_inspectors" @@ -15,7 +15,6 @@ width="300"> Click to spawn an inspector: </text> - <!-- James Tester, 4 years old --> <button name="avatar_2d_btn1" label="Avatar 2D" @@ -25,7 +24,7 @@ width="100" commit_callback.function="ShowAvatarInspector" commit_callback.parameter="22df1dcb-810a-4975-aab9-0159958fe155" /> - <!-- DonkeyPuncher 2008-10-1 --> + <!-- InspectorA Tester --> <button name="avatar_2d_btn5" label="Avatar 2D" @@ -34,8 +33,8 @@ height="20" width="100" commit_callback.function="ShowAvatarInspector" - commit_callback.parameter="d5330e4e-391a-4f00-9352-b797ed2f9a97" /> - <!-- DonkeyPuncher 2009-01-15 --> + commit_callback.parameter="927e68e0-e52d-4bb8-b1a9-add97a57c86a" /> + <!-- InspectorB Tester --> <button name="avatar_2d_btn2" label="Avatar 2D" @@ -44,8 +43,8 @@ height="20" width="100" commit_callback.function="ShowAvatarInspector" - commit_callback.parameter="05511655-a58a-48b6-b645-966f69fc17a7" /> - <!-- 2009-06-14 --> + commit_callback.parameter="9a2300ca-e251-45dd-bb61-e33139f6e4eb" /> + <!-- InspectorC Tester --> <button name="avatar_2d_btn3" label="Avatar 2D" @@ -54,7 +53,7 @@ height="20" width="100" commit_callback.function="ShowAvatarInspector" - commit_callback.parameter="6a164b3d-7c2c-43eb-880a-0ebc0687b3ec" /> + commit_callback.parameter="8024f082-34cc-48a3-a42e-c42f345efd74" /> <!-- jarvtest Bombastic 2009-10-3 --> <button name="avatar_2d_btn4" @@ -85,7 +84,9 @@ top_pad="10" left_delta="0" height="20" - width="100"/> + width="100" + commit_callback.function="ShowObjectInspector" + commit_callback.parameter="" /> <button name="group_btn" label="Group" @@ -107,5 +108,17 @@ left_delta="0" height="20" width="100"/> + <text + follows="left|top" + font="SansSerif" + height="20" + layout="topleft" + left="0" + max_length="65536" + name="slurl" + top_pad="4" + width="100"> + secondlife:///app/agent/00000000-0000-0000-0000-000000000000/inspect + </text> </floater> 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 88c001b714..8305452c85 100644 --- a/indra/newview/skins/default/xui/en/floater_test_textbox.xml +++ b/indra/newview/skins/default/xui/en/floater_test_textbox.xml @@ -122,7 +122,6 @@ left="10" name="floater_map_north" right="30" - text="N" text_color="1 1 1 0.7" top="370"> N 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 6ddaa63c1d..5a29c6a319 100644 --- a/indra/newview/skins/default/xui/en/floater_test_widgets.xml +++ b/indra/newview/skins/default/xui/en/floater_test_widgets.xml @@ -19,6 +19,8 @@ can_resize="true" title="Test Floater" height="500" + min_width="850" + min_height="500" layout="topleft" name="floater_test_widgets" help_topic="floater_test_widgets" @@ -39,6 +41,7 @@ <menu_bar height="18" layout="topleft" + follows="top|left" tool_tip="menu" left="2" name="test_menu_bar" @@ -74,7 +77,9 @@ <text bottom="55" layout="topleft" - left="10"> + follows="top|left" + left="10" + height="16"> For widget list see https://wiki.lindenlab.com/wiki/Viewer:UI/Widgets </text> @@ -82,6 +87,7 @@ <button height="20" + follows="top|left" label="Button" layout="topleft" left_delta="0" @@ -91,7 +97,7 @@ width="100" /> <!-- "flyout_button" is a button that can spawn a menu --> <flyout_button - follows="right|bottom" + follows="top|left" height="20" label="Flyout" layout="topleft" @@ -121,6 +127,7 @@ provide input that is not a list item. --> <combo_box bottom_delta="35" + follows="top|left" height="16" width="150" label="Combobox" @@ -150,6 +157,7 @@ the text. --> <line_editor height="20" + follows="top|left" layout="topleft" left_delta="0" name="test_line_editor" @@ -161,7 +169,7 @@ <!-- "filter_editor" is a specialized line_editor that shows read-only help text until the user clicks in the widget. --> <filter_editor - follows="left|top|right" + follows="left|top" height="20" label="Type here to search" layout="topleft" @@ -173,6 +181,7 @@ <!-- "progress_bar" percent completed gets set in C++ code --> <progress_bar height="16" + follows="top|left" layout="topleft" left_delta="0" name="test_progress_bar" @@ -227,6 +236,7 @@ <!-- "scroll_list" is a scrolling list of columnar data. --> <scroll_list bottom_delta="100" + follows="top|left" height="80" draw_heading="true" tool_tip="scroll list" @@ -239,10 +249,19 @@ dynamic_width="true" name="second_column" label="Column B"/> + <row> + <column column="first_column">short text</column> + <column column="second_column">more short text</column> + </row> + <row> + <column column="first_column">this is some longer text</column> + <column column="second_column">and here is some more long text</column> + </row> </scroll_list> <!-- "slider" is a horizontal input widget for numerical data. --> <slider bottom_delta="45" + follows="top|left" layout="topleft" min_val="0" max_val="100" @@ -255,22 +274,36 @@ change the value. --> <spinner bottom_delta="35" + follows="top|left" label="Spinner" layout="topleft" name="test_spinner" tool_tip="spinner"/> <text bottom_delta="50" + follows="top|left" + font.name="SansSerifSmall" font.style = "UNDERLINE" layout="topleft" name="test_text" tool_tip="text"> Text (underlined) </text> + <text + top_pad="10" + follows="top|left" + layout="topleft" + width="60" + use_ellipses="true" + name="test_text" + tool_tip="text"> + Truncated text here + </text> <!-- "text_editor" is a multi-line text input widget, similar to textarea in HTML. --> <text_editor - height="80" + height="40" + follows="top|left|bottom" layout="topleft" left_delta="0" name="test_text_editor" @@ -279,7 +312,18 @@ width="200"> Text Editor </text_editor> - + <text + height="40" + follows="top|left|bottom" + layout="topleft" + name="test_text_editor" + tool_tip="text box" + top_pad="5" + width="200"> + Text box +with +multiple lines + </text> <!-- And a third column --> <!-- "tab_container" is a holder for multiple panels of UI widgets. @@ -309,7 +353,6 @@ color="0.3 0.6 0.9 1" follows="left|top" height="90" - border="true" layout="topleft" left="10" label="Color Swatch 1" @@ -333,7 +376,7 @@ </panel> <!-- panels can also refer to other floaters or panels --> <panel - border="true" + border="true" filename="floater_test_checkbox.xml" height="225" label="Tab 2 - Checkbox" 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 9a3d5aa183..4ed6787f53 100644 --- a/indra/newview/skins/default/xui/en/floater_ui_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_ui_preview.xml @@ -17,7 +17,7 @@ left="0" mouse_opaque="false" name="main_panel" - right="650" + right="750" top="0"> <text type="string" diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml index 2042ffedbc..b44acebbcf 100644 --- a/indra/newview/skins/default/xui/en/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml @@ -1,102 +1,142 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<!-- All our XML is utf-8 encoded. --> - +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <!-- Not can_close / no title to avoid window chrome Single instance - only have one at a time, recycle it each spawn --> <floater - background_opaque="false" - background_visible="true" - bevel_style="in" - bg_alpha_color="PanelDefaultBackgroundColor" - can_close="false" - can_minimize="false" - name="inspect_avatar" - help_topic="inspect_avatar" - single_instance="true" - sound_flags="0" - title="" - visible="true" - width="300" - height="200" - left="0" - top="200" - > + bevel_style="in" + bg_alpha_color="PanelDefaultBackgroundColor" + can_close="false" + can_minimize="false" + height="190" + layout="topleft" + name="inspect_avatar" + single_instance="true" + sound_flags="0" + visible="true" + width="300"> <!-- Allowed fields include: [BORN_ON] ("12/3/2008") [SL_PROFILE] (Second Life profile), - [RW_PROFILE] (real world profile), + [RW_PROFILE] (real world profile), [ACCTTYPE] ("Resident"), [PAYMENTINFO] ("Payment Info on File"), - [AGE] ("1 year 2 months") --> - <string name="Subtitle"> + [AGE] ("1 year 2 months") + --> + <string + name="Subtitle"> [AGE] </string> - <string name="Details"> -[ACCTTYPE], [PAYMENTINFO] -Profile: [SL_PROFILE] + <string + name="Details"> +[ACCTTYPE][COMMA] [PAYMENTINFO] + </string> + <string + name="Partner"> + Partner: [PARTNER] </string> <text - top="180" left="10" width="280" height="70" follows="left|top|right|bottom" - use_ellipses="true" word_wrap="true" - font="SansSerifHugeBold" text_color="white" - mouse_opaque="true" name="user_name" > - Test Name - </text> - <!-- General purpose subtitle area, not sure yet what goes here --> - <text - top="155" left="10" width="150" height="20" follows="left|top|right|bottom" - font="SansSerifBig" - text_color="white" - mouse_opaque="true" - name="user_subtitle" /> - <!-- Leave text fields blank so it doesn't flash when data arrives off the network --> - <text - top="115" left="10" width="290" height="50" follows="left|top|right|bottom" - font="SansSerifSmall" text_color="white" word_wrap="true" - mouse_opaque="true" name="user_details" /> - <avatar_icon - top="185" left="230" width="60" height="60" follows="left|top|right|bottom" - color="1 1 1 1" enabled="true" mouse_opaque="true" name="avatar_icon" - /> - <slider - bottom="35" left="45" width="250" height="30" follows="top|left" - name="volume_slider" - tool_tip="Voice Volume" - increment="0.05" initial_value="0.75" max_val="1" min_val="0" - show_text="false" - /> - <button - bottom="40" left="10" width="32" height="16" follows="left|top|right|bottom" - name="mute_btn" - label="" - image_unselected="icn_speaker_dark.tga" - image_disabled="icn_speaker_dark.tga" - image_selected="icn_speaker-muted_dark.tga" - image_hover_selected="icn_speaker-muted_dark.tga" - image_disabled_selected="icn_speaker-muted_dark.tga" - halign="center" - toggle="true" - /> - <button - bottom="10" left="10" width="110" height="20" follows="top|left" - name="add_friend_btn" - label="Add Friend" - font="SansSerif" - /> - <button - bottom="10" left="120" width="110" height="20" follows="top|left" - name="view_profile_btn" - label="View Profile" - font="SansSerif" - /> - <button - bottom="10" left="230" width="60" height="20" follows="top|left" - name="gear_btn" - label="" - image_overlay="Icon_Gear_Foreground" - image_overlay_alignment="center" - scale_image="true" - /> -</floater> + follows="left|top|right|bottom" + font="SansSerifHugeBold" + height="70" + left="10" + name="user_name" + text_color="white" + top="20" + use_ellipses="true" + value="Test Name" + width="280" + word_wrap="true" /> + <text + follows="left|top|right|bottom" + font="SansSerifBig" + height="20" + left="10" + name="user_subtitle" + text_color="white" + top="45" + width="150" /> + <!-- Leave text fields blank so it doesn't flash when data arrives off the network --> + <text + follows="left|top|right|bottom" + height="20" + left="10" + name="user_details" + text_color="white" + top="85" + width="290" + word_wrap="true" /> + <text + follows="left|top|right|bottom" + height="20" + left="10" + name="user_partner" + text_color="white" + top="105" + width="290" + word_wrap="true" /> + <avatar_icon + follows="left|top|right|bottom" + height="60" + left="230" + mouse_opaque="true" + name="avatar_icon" + top="15" + width="60" /> + <slider + follows="top|left" + height="30" + increment="0.05" + left="20" + max_val="0.95" + min_val="0.05" + name="volume_slider" + show_text="false" + tool_tip="Voice Volume" + top="125" + value="0.5" + width="240" /> + <button + follows="left|top|right|bottom" + height="16" + image_disabled="icn_speaker_dark.tga" + image_disabled_selected="icn_speaker-muted_dark.tga" + image_hover_selected="icn_speaker-muted_dark.tga" + image_selected="icn_speaker-muted_dark.tga" + image_unselected="icn_speaker_dark.tga" + is_toggle="true" + left="265" + name="mute_btn" + picture_style="true" + top="132" + width="32" /> + <button + follows="top|left" + font="SansSerif" + height="20" + label="Add Friend" + left="10" + name="add_friend_btn" + top_pad="10" + width="105" /> + <button + follows="top|left" + font="SansSerif" + height="20" + label="View Profile" + left_delta="110" + name="view_profile_btn" + top_delta="0" + width="105" /> + <menu_button + follows="top|left" + height="20" + image_overlay="windows\Icon_Gear_Foreground.png" + image_overlay_alignment="center" + menu_filename="menu_inspect_avatar_gear.xml" + name="gear_btn" + picture_style="true" + top_delta="0" + left_delta="110" + width="60"/> +</floater> diff --git a/indra/newview/skins/default/xui/en/inspect_object.xml b/indra/newview/skins/default/xui/en/inspect_object.xml new file mode 100644 index 0000000000..cc56f630b0 --- /dev/null +++ b/indra/newview/skins/default/xui/en/inspect_object.xml @@ -0,0 +1,162 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- + Not can_close / no title to avoid window chrome + Single instance - only have one at a time, recycle it each spawn +--> +<floater + bevel_style="in" + bg_opaque_color="MouseGray" + can_close="false" + can_minimize="false" + height="145" + layout="topleft" + name="inspect_object" + single_instance="true" + sound_flags="0" + visible="true" + width="300"> + <string name="Creator">By [CREATOR]</string> + <string name="CreatorAndOwner"> +By [CREATOR] +Owned by [OWNER] + </string> + <!-- *TODO: Might need to change to [AMOUNT] if icon contains "L$" --> + <string name="Price">L$[AMOUNT]</string> + <string name="PriceFree">Free!</string> + <string name="Touch">Touch</string> + <string name="Sit">Sit</string> + <text + follows="all" + font="SansSerifLargeBold" + height="20" + left="8" + name="object_name" + text_color="white" + top="8" + use_ellipses="true" + value="Test Object Name That Is Really Long" + width="268" /> + <text + follows="all" + font="SansSerif" + height="30" + left="10" + name="object_creator" + top_pad="0" + width="280"> +By Longavatarname Johnsonlongstonnammer +Owned by James Linden + </text> + <text + follows="all" + height="45" + left="100" + name="object_description" + top_pad="4" + width="200" + word_wrap="true"> +This is a really long description for an object being as how it is at least 80 characters in length and maybe more like 120 at this point. Who knows, really? + </text> + <!-- *TODO: Replace this icon --> + <icon + name="price_icon" + image_name="Favorite_Star_Active" + left="5" + width="16" + height="16" + top="79" + follows="left|top" + /> + <text + follows="all" + font="SansSerifSmallBold" + height="45" + left="22" + name="price_text" + text_color="white" + top="80" + font_shadow="none" + width="80"> +L$300,000 + </text> + <!-- Overlapping buttons for all default actions. Show "Buy" if + for sale, "Sit" if can sit, etc. --> + <button + follows="top|left" + font="SansSerif" + height="23" + label="Buy" + left="10" + name="buy_btn" + top="116" + width="100" /> + <button + follows="top|left" + font="SansSerif" + height="23" + label="Pay" + left_delta="0" + name="pay_btn" + top_delta="0" + width="100" /> + <button + follows="top|left" + font="SansSerif" + height="23" + label="Take Copy" + left_delta="0" + name="take_free_copy_btn" + top_delta="0" + width="100" /> + <button + follows="top|left" + font="SansSerifSmall" + height="23" + label="Touch" + left_delta="0" + name="touch_btn" + top_delta="0" + width="100" /> + <button + follows="top|left" + font="SansSerif" + height="23" + label="Sit" + left_delta="0" + name="sit_btn" + top_delta="0" + width="100" /> + <button + follows="top|left" + font="SansSerifSmall" + height="23" + label="Open" + left_delta="0" + name="open_btn" + top_delta="0" + width="100" /> + <!-- non-overlapping buttons here --> + <menu_button + follows="top|left" + height="23" + image_overlay="Icon_Gear_Foreground" + image_overlay_alignment="center" + right="-8" + menu_filename="menu_inspect_object_gear.xml" + name="gear_btn" + picture_style="true" + top_delta="0" + width="30" /> + <button + follows="top|left" + height="22" + image_overlay="TabIcon_Close_Off" + layout="topleft" + name="more_info_btn" + picture_style="true" + right="-8" + top="7" + left_delta="110" + tab_stop="false" + width="20" /> +</floater> 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 new file mode 100644 index 0000000000..9f5b7f3813 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml @@ -0,0 +1,114 @@ +<?xml version="1.0" encoding="utf-8"?>
+<menu
+ create_jump_keys="true"
+ layout="topleft"
+ mouse_opaque="false"
+ visible="false"
+ name="Gear Menu">
+ <menu_item_call
+ label="View Profile"
+ layout="topleft"
+ enabled="true"
+ name="view_profile">
+ <menu_item_call.on_click
+ function="InspectAvatar.ViewProfile"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Add Friend"
+ layout="topleft"
+ name="add_friend">
+ <menu_item_call.on_click
+ function="InspectAvatar.AddFriend"/>
+ </menu_item_call>
+ <menu_item_call
+ label="IM"
+ layout="topleft"
+ name="im">
+ <menu_item_call.on_click
+ function="InspectAvatar.IM"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Call"
+ layout="topleft"
+ enabled="true"
+ name="call">
+ </menu_item_call>
+ <menu_item_call
+ label="Teleport"
+ layout="topleft"
+ name="teleport">
+ <menu_item_call.on_click
+ function="InspectAvatar.Teleport"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Invite to Group"
+ layout="topleft"
+ name="invite_to_group">
+ <menu_item_call.on_click
+ function="InspectAvatar.InviteToGroup"/>
+ </menu_item_call>
+ <menu_item_separator layout="topleft" />
+ <menu_item_call
+ label="Block"
+ layout="topleft"
+ name="block">
+ <menu_item_call.on_click
+ function="InspectAvatar.Block"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Report"
+ layout="topleft"
+ name="report">
+ <menu_item_call.on_click
+ function="InspectAvatar.Report"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Freeze"
+ layout="topleft"
+ name="freeze">
+ <menu_item_call.on_click
+ function="InspectAvatar.Freeze"/>
+ <menu_item_call.on_visible
+ function="InspectAvatar.VisibleGodMode"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Eject"
+ layout="topleft"
+ name="eject">
+ <menu_item_call.on_click
+ function="InspectAvatar.Eject"/>
+ <menu_item_call.on_visible
+ function="InspectAvatar.VisibleGodMode"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Debug"
+ layout="topleft"
+ name="debug">
+ <menu_item_call.on_click
+ function="InspectAvatar.Debug"/>
+ <menu_item_call.on_visible
+ function="InspectAvatar.VisibleGodMode"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Find On Map"
+ layout="topleft"
+ name="find_on_map">
+ <menu_item_call.on_click
+ function="InspectAvatar.FindOnMap"/>
+ <menu_item_call.on_visible
+ function="InspectAvatar.VisibleFindOnMap"/>
+ </menu_item_call>
+ <menu_item_call
+ enabled="false"
+ label="Zoom In"
+ layout="topleft"
+ name="zoom_in">
+ </menu_item_call>
+ <menu_item_call
+ label="Pay"
+ layout="topleft"
+ name="pay">
+ <menu_item_call.on_click
+ function="InspectAvatar.Pay"/>
+ </menu_item_call>
+</menu>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml new file mode 100644 index 0000000000..1bba8eb264 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml @@ -0,0 +1,129 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu + create_jump_keys="true" + layout="topleft" + mouse_opaque="false" + visible="false" + name="Gear Menu"> + <menu_item_call + label="Touch" + layout="topleft" + enabled="true" + name="touch"> + <menu_item_call.on_click + function="InspectObject.Touch"/> + <menu_item_call.on_visible + function="Object.VisibleTouch" /> + </menu_item_call> + <menu_item_call + label="Sit" + layout="topleft" + name="sit"> + <menu_item_call.on_click + function="InspectObject.Sit"/> + <menu_item_call.on_visible + function="Object.EnableSit" /> + </menu_item_call> + <menu_item_call + label="Pay" + layout="topleft" + name="pay"> + <menu_item_call.on_click + function="InspectObject.Pay"/> + <menu_item_call.on_visible + function="VisiblePayObject" /> + </menu_item_call> + <menu_item_call + label="Buy" + layout="topleft" + enabled="true" + name="buy"> + <menu_item_call.on_click + function="InspectObject.Buy"/> + <menu_item_call.on_visible + function="Object.VisibleBuy" /> + </menu_item_call> + <menu_item_call + label="Take" + layout="topleft" + name="take"> + <menu_item_call.on_click + function="Object.Take" /> + <menu_item_call.on_enable + function="Object.VisibleTake"/> + </menu_item_call> + <menu_item_call + label="Take Copy" + layout="topleft" + name="take_copy"> + <menu_item_call.on_click + function="InspectObject.TakeFreeCopy"/> + <menu_item_call.on_visible + function="Tools.VisibleTakeCopy"/> + </menu_item_call> + <menu_item_call + label="Open" + layout="topleft" + name="open"> + <menu_item_call.on_click + function="InspectObject.Open"/> + <menu_item_call.on_visible + function="Object.VisibleOpen" /> + </menu_item_call> + <menu_item_call + label="Edit" + layout="topleft" + name="report"> + <menu_item_call.on_click + function="Object.Edit" /> + <menu_item_call.on_enable + function="Object.VisibleEdit"/> + </menu_item_call> + <menu_item_call + label="Wear" + layout="topleft" + name="wear"> + <menu_item_call.on_click + function="Object.AttachToAvatar" /> + <menu_item_call.on_visible + function="Object.VisibleWear" /> + </menu_item_call> + <menu_item_call + label="Report" + layout="topleft" + name="report"> + <menu_item_call.on_click + function="Object.ReportAbuse" /> + </menu_item_call> + <menu_item_call + label="Block" + layout="topleft" + name="block"> + <menu_item_call.on_click + function="Object.Mute" /> + <menu_item_call.on_visible + function="Object.VisibleMute" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Zoom In" + layout="topleft" + name="zoom_in"> + </menu_item_call> + <menu_item_call + label="Remove" + layout="topleft" + name="remove"> + <menu_item_call.on_click + function="Object.Delete" /> + <menu_item_call.on_visible + function="Object.VisibleDelete" /> + </menu_item_call> + <menu_item_call + label="More Info" + layout="topleft" + name="more_info"> + <menu_item_call.on_click + function="InspectObject.MoreInfo"/> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index fe088b43be..829c2e02d8 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -447,7 +447,7 @@ Your default permissions may not work in older regions. icon="alertmodal.tga" name="ClickUnimplemented" type="alertmodal"> -This feature is yet to be implemented. +Sorry, not implemented yet. </notification> <notification @@ -761,7 +761,7 @@ You need an account to enter [SECOND_LIFE]. Would you like to create one now? name="url" openexternally = "1"> - http://secondlife.com/registration/ + http://join/secondlife.com/ </url> <usetemplate name="okcancelbuttons" diff --git a/indra/newview/skins/default/xui/en/panel_audio_device.xml b/indra/newview/skins/default/xui/en/panel_audio_device.xml index 5f495ef8ce..4329982209 100644 --- a/indra/newview/skins/default/xui/en/panel_audio_device.xml +++ b/indra/newview/skins/default/xui/en/panel_audio_device.xml @@ -80,7 +80,7 @@ bg_readonly_color="0 0 0 0" enabled="false" height="60" - hide_border="true" + border_visible="false" hide_scrollbar="true" layout="topleft" left_delta="10" 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 d5ed0c986d..c3ae2d953a 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 @@ -62,7 +62,6 @@ auto_update="true" follows="right" draw_border="false" - halign="left" height="16" layout="topleft" left_pad="3" diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml index 0d6d8ba97d..b13058f40a 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml @@ -201,7 +201,7 @@ type="string" follows="left|top" font="SansSerifSmall" - font.style="BOLD" + font.style="BOLD" height="15" layout="topleft" left="10" @@ -272,7 +272,7 @@ <text follows="left|top" font="SansSerifSmall" - font.style="BOLD" + font.style="BOLD" height="15" layout="topleft" left="10" @@ -305,7 +305,7 @@ <text follows="left|top" font="SansSerifSmall" - font.style="BOLD" + font.style="BOLD" height="15" layout="topleft" left="10" @@ -391,6 +391,7 @@ follows="left|top" height="10" layout="topleft" + font="SansSerifSmall" font.style="BOLD" left="12" mouse_opaque="false" diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml index 069cf1d7bd..999aa814b1 100644 --- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml @@ -55,7 +55,6 @@ <scroll_list draw_heading="true" follows="top" - font="SansSerifSmall" heading_height="14" height="100" 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 c96c296057..aeeb884036 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -9,7 +9,7 @@ width="800"> <panel.string name="create_account_url"> - http://secondlife.com/registration/ + http://join.secondlife.com/ </panel.string> <panel.string name="real_url"> diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index 02d179d503..b4212aaa34 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -17,6 +17,10 @@ http://www.secondlife.com/account/billing.php?lang=en </string> <string + name="partner_edit_link_url"> + http://www.secondlife.com/account/partners.php?lang=en + </string> + <string name="my_account_link_url" value="http://secondlife.com/account" /> <string diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml index 9b2461db7c..9abaf29f57 100644 --- a/indra/newview/skins/default/xui/en/panel_progress.xml +++ b/indra/newview/skins/default/xui/en/panel_progress.xml @@ -82,7 +82,8 @@ name="progress_text" text_color="LoginProgressBoxTextColor" top_pad="5" - width="593" /> + width="593" + word_wrap="true"/> <progress_bar bottom="115" color_bar="1 1 1 0.96" @@ -100,11 +101,12 @@ height="100" layout="topleft" left="45" - line_spacing="2" + line_spacing.pixels="2" name="message_text" text_color="LoginProgressBoxTextColor" top="145" - width="550" /> + width="550" + word_wrap="true"/> </layout_panel> <layout_panel height="200" diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml index a3c714ce72..765e2ae623 100644 --- a/indra/newview/skins/default/xui/en/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml @@ -32,8 +32,6 @@ <text_editor type="string" length="1" - bevel_style="none" - border_style="line" bottom="393" follows="left|top|right|bottom" font="Monospace" diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml index 418b88b7b5..d172154d49 100644 --- a/indra/newview/skins/default/xui/en/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml @@ -21,7 +21,6 @@ filename="panel_sidetray_home_tab.xml" label="home" border="true" - font="SansSerifBold" /> </sidetray_tab> @@ -44,14 +43,12 @@ name="panel_people" filename="panel_people.xml" border="true" - font="SansSerifBold" /> <panel class="panel_profile_view" name="panel_profile_view" filename="panel_profile_view.xml" border="true" - font="SansSerifBold" /> <panel class="panel_group_info_sidetray" @@ -107,7 +104,6 @@ filename="panel_me_profile.xml" label="Me" border="true" - font="SansSerifBold" /> </sidetray_tab> 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 f6ffd2e4ee..07f0806ccb 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -58,7 +58,7 @@ <text type="string" length="1" - disabled_color="TimeTextColor" + text_readonly_color="TimeTextColor" follows="right|bottom" halign="right" height="16" @@ -100,9 +100,8 @@ visible="false" width="16" /> <text - type="string" - length="1" - disabled_color="HealthTextColor" + bg_visible="false" + text_readonly_color="HealthTextColor" follows="rsight|bottom" font_shadow="hard" height="16" diff --git a/indra/newview/skins/default/xui/en/panel_world_map.xml b/indra/newview/skins/default/xui/en/panel_world_map.xml index ee355fa95c..9f08d3a817 100644 --- a/indra/newview/skins/default/xui/en/panel_world_map.xml +++ b/indra/newview/skins/default/xui/en/panel_world_map.xml @@ -51,7 +51,6 @@ label="N" layout="topleft" name="floater_map_north" - text="N" text_color="1 1 1 0.7"> N </text> @@ -61,7 +60,6 @@ label="E" layout="topleft" name="floater_map_east" - text="E" text_color="1 1 1 0.7"> E </text> @@ -71,7 +69,6 @@ label="W" layout="topleft" name="floater_map_west" - text="W" text_color="1 1 1 0.7"> W </text> @@ -81,7 +78,6 @@ label="S" layout="topleft" name="floater_map_south" - text="S" text_color="1 1 1 0.7"> S </text> @@ -91,7 +87,6 @@ label="SE" layout="topleft" name="floater_map_southeast" - text="SE" text_color="1 1 1 0.7"> SE </text> @@ -101,7 +96,6 @@ label="NE" layout="topleft" name="floater_map_northeast" - text="NE" text_color="1 1 1 0.7"> NE </text> @@ -111,7 +105,6 @@ label="SW" layout="topleft" name="floater_map_southwest" - text="SW" text_color="1 1 1 0.7"> SW </text> @@ -121,7 +114,6 @@ label="NW" layout="topleft" name="floater_map_northwest" - text="NW" text_color="1 1 1 0.7"> NW </text> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index f398cc33b5..3a5347fe12 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -15,9 +15,6 @@ <string name="StartupDetectingHardware">Detecting hardware...</string> <string name="StartupLoading">Loading</string> <string name="Fullbright">Fullbright (Legacy)</string> - <string name="CacheWaiting">(Loading...)</string> - <string name="CacheNobody">(nobody)</string> - <string name="CacheNone">(none)</string> <!-- Login --> <string name="LoginInProgress">Logging in. [APP_NAME] may appear frozen. Please wait.</string> <string name="LoginInProgressNoFrozen">Logging in...</string> @@ -40,13 +37,14 @@ <string name="LoginDownloadingClothing">Downloading clothing...</string> <string name="LoginFailedNoNetwork">Network Error: Could not establish connection, please check your network connection.</string> <string name="Quit">Quit</string> - <string name="create_account_url">http://secondlife.com/registration/</string> + <string name="create_account_url">http://join.secondlife.com/</string> <!-- Disconnection --> <string name="AgentLostConnection">This region may be experiencing trouble. Please check your connection to the Internet.</string> <!-- Tooltip, lltooltipview.cpp --> + <!-- *TODO: Most of these are now unused, eliminate them --> <string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar --> <string name="TooltipNoName">(no name)</string> <!-- No name on an object --> <string name="TooltipOwner">Owner:</string> <!-- Owner name follows --> @@ -118,7 +116,10 @@ <!-- Avatar name: text shown while fetching name --> <string name="AvatarNameWaiting">(waiting)</string> - <!-- Avatar name: text shown as an alternative to AvatarNameFetching, easter egg. --> + <!-- Avatar name: More than one avatar is selected/used here --> + <string name="AvatarNameMultiple">(multiple)</string> + + <!-- Avatar name: text shown as an alternative to AvatarNameFetching, easter egg. --> <string name="AvatarNameHippos">(hippos)</string> <!-- Group name: text shown for LLUUID::null --> @@ -1931,21 +1932,24 @@ this texture in your inventory <string name="Left Pec">Left Pec</string> <string name="Right Pec">Right Pec</string> - <!-- Avatar age computation, see LLAvatarPropertiesProcessor::ageFromDate --> - <string name="YearsMonthsOld">[AGEYEARS][AGEMONTHS]old</string> - <string name="WeeksOld">[AGEWEEKS]old</string> - <string name="DaysOld">[AGEDAYS]old</string> + <!-- Avatar age computation, see LLDateUtil::ageFromDate --> + <string name="YearsMonthsOld">[AGEYEARS] [AGEMONTHS] old</string> + <string name="YearsOld">[AGEYEARS] old</string> + <string name="MonthsOld">[AGEMONTHS] old</string> + <string name="WeeksOld">[AGEWEEKS] old</string> + <string name="DaysOld">[AGEDAYS] old</string> <string name="TodayOld">Joined today</string> - <!-- Use value="" because of trailing spaces --> - <string name="AgeYears" value="[YEARS] years " /> - <string name="Age1Year" value="1 year "/> - <string name="AgeMonths" value="[MONTHS] months "/> - <string name="Age1Month" value="1 month "/> - <string name="AgeWeeks" value="[WEEKS] weeks "/> - <string name="Age1Week" value="1 week "/> - <string name="AgeDays" value="[DAYS] days "/> - <string name="Age1Day" value="1 day "/> + <!-- AgeYearsA = singular, AgeYearsB = plural, see logic in + LLTrans::getCountString() --> + <string name="AgeYearsA">[COUNT] year</string> + <string name="AgeYearsB">[COUNT] years</string> + <string name="AgeMonthsA">[COUNT] month</string> + <string name="AgeMonthsB">[COUNT] months</string> + <string name="AgeWeeksA">[COUNT] week</string> + <string name="AgeWeeksB">[COUNT] weeks</string> + <string name="AgeDaysA">[COUNT] day</string> + <string name="AgeDaysB">[COUNT] days</string> <!-- Account types, see LLAvatarPropertiesProcessor --> <string name="AcctTypeResident">Resident</string> @@ -1995,8 +1999,8 @@ this texture in your inventory <!-- groups --> <string name="GroupsNone">none</string> - <string name="Group" value=" (group)" /> - <string name="Unknown">(Unknown)</string> + <string name="Group" value=" (group)" /> + <string name="Unknown">(Unknown)</string> <string name="SummaryForTheWeek" value="Summary for this week, beginning on " /> <string name="NextStipendDay" value="The next stipend day is " /> <string name="GroupIndividualShare" value=" Group Individual Share" /> diff --git a/indra/newview/skins/default/xui/en/widgets/line_editor.xml b/indra/newview/skins/default/xui/en/widgets/line_editor.xml index 8b4126952e..546fbd9b47 100644 --- a/indra/newview/skins/default/xui/en/widgets/line_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/line_editor.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<line_editor - background_image="TextField_Off" - background_image_disabled="TextField_Disabled" - background_image_focused="TextField_Active" +<line_editor background_image="TextField_Off" + background_image_disabled="TextField_Disabled" + background_image_focused="TextField_Active" select_on_focus="false" handle_edit_keys_directly="false" commit_on_focus_lost="true" diff --git a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml index 4f2261c953..8ace7b96bc 100644 --- a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml @@ -1,22 +1,26 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <simple_text_editor + allow_html="false" mouse_opaque="true" font="SansSerifSmall" max_length="255" embedded_items="false" hide_scrollbar="false" - hide_border="true" + border_visible="false" word_wrap="false" ignore_tab="true" + line_spacing.pixels="1" track_bottom="false" cursor_color="TextCursorColor" default_color="TextDefaultColor" text_color="TextFgColor" text_readonly_color="TextFgReadOnlyColor" + h_pad="5" + v_pad="3" + bg_visible="true" bg_readonly_color="TextBgReadOnlyColor" bg_writeable_color="TextBgWriteableColor" - bg_focus_color="TextBgFocusColor" - link_color="HTMLLinkColor"> + bg_focus_color="TextBgFocusColor"> <simple_text_editor.border bevel_style="in" follows="all" /> diff --git a/indra/newview/skins/default/xui/en/widgets/text.xml b/indra/newview/skins/default/xui/en/widgets/text.xml index 3d98cd66f9..7d78a8fa20 100644 --- a/indra/newview/skins/default/xui/en/widgets/text.xml +++ b/indra/newview/skins/default/xui/en/widgets/text.xml @@ -1,16 +1,20 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<text name="text_box" +<text allow_html="true" + clip_to_rect="false" + name="text_box" font="SansSerifSmall" font_shadow="soft" tab_stop="false" halign="left" hover_color="LabelSelectedColor" - disabled_color="LabelDisabledColor" - background_color="FloaterDefaultBackgroundColor" + h_pad="-1" + hide_scrollbar="true" + text_readonly_color="LabelDisabledColor" + bg_writeable_color="FloaterDefaultBackgroundColor" border_color="DefaultHighlightLight" use_ellipses="false" bg_visible="false" - border_drop_shadow_visible="false" border_visible="false" hover="false" - text_color="LabelTextColor"/> + text_color="LabelTextColor" + v_pad="-1"/> diff --git a/indra/newview/skins/default/xui/en/widgets/text_editor.xml b/indra/newview/skins/default/xui/en/widgets/text_editor.xml index deaade04f8..23ca8ea338 100644 --- a/indra/newview/skins/default/xui/en/widgets/text_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/text_editor.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <!-- Core parameters are in simple_text_editor.xml --> <text_editor - allow_html="false" /> + allow_html="false"/> diff --git a/indra/newview/skins/default/xui/en/widgets/textbase.xml b/indra/newview/skins/default/xui/en/widgets/textbase.xml new file mode 100644 index 0000000000..c352abca3b --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/textbase.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<textbase clip_to_rect="true" + h_pad="4" + v_pad="4"/> diff --git a/indra/newview/skins/default/xui/nl/floater_telehub.xml b/indra/newview/skins/default/xui/nl/floater_telehub.xml index 5a8abc208a..8fe8e06c03 100644 --- a/indra/newview/skins/default/xui/nl/floater_telehub.xml +++ b/indra/newview/skins/default/xui/nl/floater_telehub.xml @@ -17,7 +17,7 @@ <text name="spawn_points_text"> Spawnpunten (posities, niet objecten): </text> - <scroll_list bottom_delta="-44" draw_border="true" follows="left|top" font="SansSerifSmall" + <scroll_list bottom_delta="-44" draw_border="true" follows="left|top" height="40" left="10" multi_select="false" name="spawn_points_list" width="230" /> |
