diff options
Diffstat (limited to 'indra/newview/skins')
49 files changed, 668 insertions, 305 deletions
diff --git a/indra/newview/skins/default/textures/icons/Group_Notices.png b/indra/newview/skins/default/textures/icons/Group_Notices.png Binary files differnew file mode 100644 index 0000000000..601502d374 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Group_Notices.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index c733d3feaf..97468c3b2e 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -241,6 +241,8 @@ with the same filename but different name <texture name="Generic_Person" file_name="icons/Generic_Person.png" preload="false" /> <texture name="Generic_Person_Large" file_name="icons/Generic_Person_Large.png" preload="false" /> + <texture name="Group_Notices" file_name="icons/Group_Notices.png" preload="false" /> + <texture name="Hand" file_name="icons/hand.png" preload="false" /> <texture name="Help_Press" file_name="navbar/Help_Press.png" preload="false" /> diff --git a/indra/newview/skins/default/xui/da/emoji_categories.xml b/indra/newview/skins/default/xui/da/emoji_categories.xml index 456b18e4e2..f2a7f7a3aa 100644 --- a/indra/newview/skins/default/xui/da/emoji_categories.xml +++ b/indra/newview/skins/default/xui/da/emoji_categories.xml @@ -5,13 +5,13 @@ <key>Name</key> <string>smileys and emotion</string> <key>Category</key> - <string>smileys and følelser</string> + <string>smileys & følelser</string> </map> <map> <key>Name</key> <string>people and body</string> <key>Category</key> - <string>mennesker and krop</string> + <string>mennesker & krop</string> </map> <map> <key>Name</key> @@ -23,19 +23,19 @@ <key>Name</key> <string>animals and nature</string> <key>Category</key> - <string>dyr and natur</string> + <string>dyr & natur</string> </map> <map> <key>Name</key> <string>food and drink</string> <key>Category</key> - <string>mad and drikke</string> + <string>mad & drikke</string> </map> <map> <key>Name</key> <string>travel and places</string> <key>Category</key> - <string>rejser and steder</string> + <string>rejser & steder</string> </map> <map> <key>Name</key> diff --git a/indra/newview/skins/default/xui/de/emoji_categories.xml b/indra/newview/skins/default/xui/de/emoji_categories.xml index ed63d0bac9..ff9e4aec63 100644 --- a/indra/newview/skins/default/xui/de/emoji_categories.xml +++ b/indra/newview/skins/default/xui/de/emoji_categories.xml @@ -5,13 +5,13 @@ <key>Name</key> <string>smileys and emotion</string> <key>Category</key> - <string>Smileys and Emotionen</string> + <string>Smileys & Emotionen</string> </map> <map> <key>Name</key> <string>people and body</string> <key>Category</key> - <string>Menschen and Körper</string> + <string>Menschen & Körper</string> </map> <map> <key>Name</key> @@ -23,19 +23,19 @@ <key>Name</key> <string>animals and nature</string> <key>Category</key> - <string>Tiere and Natur</string> + <string>Tiere & Natur</string> </map> <map> <key>Name</key> <string>food and drink</string> <key>Category</key> - <string>Essen and Trinken</string> + <string>Essen & Trinken</string> </map> <map> <key>Name</key> <string>travel and places</string> <key>Category</key> - <string>Reisen and Orte</string> + <string>Reisen & Orte</string> </map> <map> <key>Name</key> diff --git a/indra/newview/skins/default/xui/en/emoji_categories.xml b/indra/newview/skins/default/xui/en/emoji_categories.xml index 0315d0c43a..5e7700da33 100644 --- a/indra/newview/skins/default/xui/en/emoji_categories.xml +++ b/indra/newview/skins/default/xui/en/emoji_categories.xml @@ -1,17 +1,21 @@ <?xml version="1.0" ?> <llsd xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="llsd.xsd"> + <!-- WARNING: This file isn't directly localizable at the moment, + translated variants Must match values provided by + 3p_emoji_shortcodes via emoji_characters for categories + to work correctly--> <array> <map> <key>Name</key> <string>smileys and emotion</string> <key>Category</key> - <string>smileys and emotion</string> + <string>smileys & emotion</string> </map> <map> <key>Name</key> <string>people and body</string> <key>Category</key> - <string>people and body</string> + <string>people & body</string> </map> <map> <key>Name</key> @@ -23,19 +27,19 @@ <key>Name</key> <string>animals and nature</string> <key>Category</key> - <string>animals and nature</string> + <string>animals & nature</string> </map> <map> <key>Name</key> <string>food and drink</string> <key>Category</key> - <string>food and drink</string> + <string>food & drink</string> </map> <map> <key>Name</key> <string>travel and places</string> <key>Category</key> - <string>travel and places</string> + <string>travel & places</string> </map> <map> <key>Name</key> diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml index 4655a4d394..93b306d7d7 100644 --- a/indra/newview/skins/default/xui/en/floater_camera.xml +++ b/indra/newview/skins/default/xui/en/floater_camera.xml @@ -138,13 +138,13 @@ </panel> </panel> <panel - follows="all" + follows="left|top" height="102" layout="topleft" left_pad="2" + right="-2" name="buttons_panel" - top="22" - width="212"> + top="22"> <panel_camera_item name="front_view" tool_tip="Front View" @@ -253,4 +253,22 @@ function="CameraPresets.Save"/> </button> </panel> + <panel + name="viewer_camera_info" + left="0" + top="135" + width="400" + height="150" + border="true" + visible="false" + background_visible="true"/> + <panel + name="agent_camera_info" + left="0" + top="285" + width="400" + height="150" + border="true" + visible="false" + background_visible="true"/> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_create_landmark.xml b/indra/newview/skins/default/xui/en/floater_create_landmark.xml index ba2527e550..abe8344097 100644 --- a/indra/newview/skins/default/xui/en/floater_create_landmark.xml +++ b/indra/newview/skins/default/xui/en/floater_create_landmark.xml @@ -39,7 +39,7 @@ layout="topleft" max_length_bytes="63" name="title_editor" - prevalidate_callback="ascii" + prevalidator="ascii" text_readonly_color="white" top_pad="5" width="290" /> @@ -87,7 +87,7 @@ name="notes_editor" spellcheck="true" text_readonly_color="white" - text_type="ascii_with_newline" + prevalidator="ascii_with_newline" commit_on_focus_lost="true" top_pad="5" width="290" diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml index 2eacc8150e..1500c96b8d 100644 --- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml +++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml @@ -60,7 +60,7 @@ left_pad="10" max_length_bytes="100" name="day_cycle_name" - prevalidate_callback="ascii" + prevalidator="ascii" top="5" width="200" height="21" /> diff --git a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml index d21f8c82bc..f642ca93b7 100644 --- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml +++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml @@ -13,8 +13,8 @@ chrome="true" height="350" width="304"> - <floater.string name="title_for_recently_used" value="Recently used"/> <floater.string name="title_for_frequently_used" value="Frequently used"/> + <floater.string name="text_no_emoji_for_filter" value="No emoji found for '[FILTER]'"/> <scroll_container name="EmojiGridContainer" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml index f424f67df0..5c31bf8ba0 100644 --- a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml +++ b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml @@ -44,7 +44,7 @@ left_delta="45" width="250" name="settings_name" - prevalidate_callback="ascii" + prevalidator="ascii" max_length_chars="63" height="20"/> <button 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 a54c28af80..738d448f00 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -335,7 +335,7 @@ </layout_panel> <layout_panel name="emoji_recent_layout_panel" - height="30" + height="36" auto_resize="false"> <text name="emoji_recent_empty_text" @@ -345,19 +345,28 @@ h_pad="20" v_pad="10" top="0" - left="1" + left="2" right="-65" - height="30" + height="34" >Recently used emojis will appear here</text> - <emoji_complete - name="emoji_recent_icons_ctrl" + <panel + name="emoji_recent_container" follows="top|left|right" layout="topleft" - max_visible="20" top="0" - left="1" + left="2" right="-65" - height="30"/> + height="34"> + <emoji_complete + name="emoji_recent_icons_ctrl" + follows="top|left|right" + layout="topleft" + max_visible="20" + top="2" + left="2" + right="-2" + height="30"/> + </panel> <button name="emoji_picker_show_btn" label="More" diff --git a/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml b/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml new file mode 100644 index 0000000000..aa3500bac2 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml @@ -0,0 +1,99 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + can_resize="false" + height="600" + layout="topleft" + min_height="175" + min_width="500" + name="contents" + help_topic="contents" + title="Inventory Thumbnails Helper" + width="800"> + <scroll_list + top="20" + height="350" + draw_stripes="true" + draw_heading="true" + follows="all" + layout="topleft" + left="8" + multi_select="true" + name="inventory_thumbnails_list" + right="-8" + tool_tip="Paste items from your inventory"> + <scroll_list.columns + dynamic_width="true" + label="Inventory Item" + name="item_name" + relative_width="0.4" /> + <scroll_list.columns + dynamic_width="true" + label="Existing Texture" + name="existing_texture" + relative_width="0.3" /> + <scroll_list.columns + dynamic_width="true" + label="New Texture" + name="new_texture" + relative_width="0.3" /> + </scroll_list> + <text_editor + top="375" + height="140" + follows="all" + left="8" + right="-8" + name="output_log" + font="Monospace" + text_color="0.1 0.5 0.1 1.0" + width="480"> + </text_editor> + <button + follows="left|bottom" + height="20" + label="Paste items from Inventory" + layout="topleft" + left="10" + name="paste_items_btn" + bottom="-60" + width="235" /> + <button + follows="left|bottom" + height="20" + label="Paste textures from Inventory" + layout="topleft" + left_delta="0" + name="paste_textures_btn" + top_delta="26 " + width="235" /> + <button + follows="left|bottom" + height="20" + label="Write Thumbnails" + layout="topleft" + left_delta="0" + name="write_thumbnails_btn" + top_delta="26 " + width="235" /> + <button + follows="left|bottom" + height="20" + label="Log items with no thumbnail" + layout="bottomleft" + right="-10" + name="log_missing_thumbnails_btn" + bottom="60" + width="235" /> + <button + follows="left|bottom" + height="20" + label="Clear thumbnails from pasted items" + layout="bottomleft" + right="-10" + name="clear_thumbnails_btn" + top_delta="26" + width="235" /> + + +</floater>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml index 5ea751dc7c..e5ec9cc97d 100644 --- a/indra/newview/skins/default/xui/en/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml @@ -211,22 +211,12 @@ <button.commit_callback function="MediaBrowser.OpenWebBrowser" /> </button> - <check_box - control_name="UseExternalBrowser" - follows="bottom|left" - height="20" - label="Always open in my web browser" - layout="topleft" - left_pad="5" - name="open_always" - top_delta="0" - width="200" /> <button follows="bottom|right" height="20" label="Close" layout="topleft" - left_pad="80" + left_pad="285" name="close" top_delta="0" width="70"> diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml index 5dcac85b4f..90223fcda8 100644 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -93,7 +93,7 @@ height="19" max_length_bytes="63" name="description_form" - prevalidate_callback="ascii" + prevalidator="ascii" top_pad="5" width="290" /> </panel> diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml index 615dbdb025..c94ad6fc9a 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater legacy_header_height="18" - height="460" - min_height="460" + height="475" + min_height="475" layout="topleft" name="gesture_preview" help_topic="gesture_preview" @@ -297,11 +297,20 @@ <check_box follows="top|left" height="20" + label="until key is released" + layout="topleft" + left="28" + name="wait_key_release_check" + top="330" + width="100" /> + <check_box + follows="top|left" + height="20" label="until animations are done" layout="topleft" left="28" name="wait_anim_check" - top="330" + top_delta="20" width="100" /> <check_box follows="top|left" diff --git a/indra/newview/skins/default/xui/en/floater_profile_texture.xml b/indra/newview/skins/default/xui/en/floater_profile_texture.xml index 5da14b75ab..7f906ff21f 100644 --- a/indra/newview/skins/default/xui/en/floater_profile_texture.xml +++ b/indra/newview/skins/default/xui/en/floater_profile_texture.xml @@ -27,7 +27,7 @@ follows="left|top" auto_resize="true" layout="topleft"> - <icon + <profile_image name="profile_pic" image_name="Generic_Person_Large" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/floater_publish_classified.xml b/indra/newview/skins/default/xui/en/floater_publish_classified.xml index 2d7d03f7a0..04840e1c64 100644 --- a/indra/newview/skins/default/xui/en/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/en/floater_publish_classified.xml @@ -25,6 +25,7 @@ Remember, Classified fees are non-refundable. </text> <spinner decimal_digits="0" + allow_digits_only="true" follows="left|top" font="SansSerif" halign="left" @@ -36,7 +37,6 @@ Remember, Classified fees are non-refundable. layout="topleft" left="15" value="50" - min_val="50" max_val="999999" name="price_for_listing" top_pad="10" diff --git a/indra/newview/skins/default/xui/en/floater_region_info.xml b/indra/newview/skins/default/xui/en/floater_region_info.xml index a7bbfc9842..2d45d08857 100644 --- a/indra/newview/skins/default/xui/en/floater_region_info.xml +++ b/indra/newview/skins/default/xui/en/floater_region_info.xml @@ -7,14 +7,16 @@ name="regioninfo" save_rect="true" title="REGION/ESTATE" - width="530"> + width="637"> <tab_container bottom="555" follows="left|right|top|bottom" layout="topleft" - left="1" + left="0" name="region_panels" - right="-1" - tab_position="top" + tab_padding_right="3" + tab_position="left" + halign="left" + tab_width="110" top="20"/> </floater> 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 2eea5c361f..226cb671f8 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 @@ -23,7 +23,7 @@ layout="topleft" left_delta="0" name="ascii_line_editor" - prevalidate_callback="ascii" + prevalidator="ascii" tool_tip="ascii line editor" top_pad="10" width="200"> 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 ab3b819e34..1cf89a8f94 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 @@ -38,7 +38,7 @@ name="numeric_text_editor" tool_tip="text editor for numeric text entry only" top_pad="10" - text_type="int" + prevalidator="int" width="200"> This is text that is NOT a number, so shouldn't appear </text_editor> diff --git a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml index 41e0183370..c11f1c88cb 100644 --- a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml @@ -35,7 +35,7 @@ layout="topleft" name="Folder Wearables Separator" /> <menu_item_call - label="Replace Current Outfit" + label="Replace current outfit" layout="topleft" name="Replace Outfit"> <menu_item_call.on_click @@ -43,7 +43,7 @@ parameter="replaceoutfit" /> </menu_item_call> <menu_item_call - label="Add To Current Outfit" + label="Add folder items" layout="topleft" name="Add To Outfit"> <menu_item_call.on_click @@ -51,7 +51,7 @@ parameter="addtooutfit" /> </menu_item_call> <menu_item_call - label="Remove From Current Outfit" + label="Take off folder items" layout="topleft" name="Remove From Outfit"> <menu_item_call.on_click diff --git a/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml index 25d64ba74d..99cee83f4e 100755 --- a/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml +++ b/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml @@ -3,7 +3,7 @@ layout="topleft" name="Outfit"> <menu_item_call - label="Wear - Replace Current Outfit" + label="Replace current outfit" layout="topleft" name="wear_replace"> <on_click @@ -16,7 +16,7 @@ parameter="wear_replace" /> </menu_item_call> <menu_item_call - label="Wear - Add to Current Outfit" + label="Add outfit items" layout="topleft" name="wear_add"> <on_click @@ -29,7 +29,7 @@ parameter="wear_add" /> </menu_item_call> <menu_item_call - label="Take Off - Remove from Current Outfit" + label="Take off outfit items" layout="topleft" name="take_off"> <on_click @@ -41,17 +41,60 @@ function="Outfit.OnVisible" parameter="take_off" /> </menu_item_call> + <menu_item_separator/> <menu_item_call - label="Image..." - layout="topleft" - name="thumbnail"> + label="Image..." + layout="topleft" + name="thumbnail"> + <on_click + function="Outfit.Thumbnail" /> + </menu_item_call> + <menu_item_call + label="Edit outfit" + layout="topleft" + name="edit"> + <on_click + function="Outfit.Edit" /> + <on_visible + function="Outfit.OnVisible" + parameter="edit" /> + </menu_item_call> + <menu_item_call + label="Rename outfit" + layout="topleft" + name="rename"> + <on_click + function="Outfit.Rename" /> + <on_enable + function="Outfit.OnEnable" + parameter="rename" /> + </menu_item_call> + <menu_item_call + label="Save to this outfit" + layout="topleft" + name="save"> + <on_click + function="Outfit.Save" /> + </menu_item_call> + <menu_item_separator> + <on_visible + function="Outfit.OnVisible" + parameter="delete" /> + </menu_item_separator> + <menu_item_call + label="Delete outfit" + layout="topleft" + name="delete"> <on_click - function="Outfit.Thumbnail" /> + function="Outfit.Delete" /> + <on_visible + function="Outfit.OnVisible" + parameter="delete" /> </menu_item_call> - <menu_item_separator name="sepatator1" /> + <menu_item_separator/> <menu height="175" - label="New Clothes" + label="New clothes" layout="topleft" left_delta="0" mouse_opaque="false" @@ -157,7 +200,7 @@ </menu> <menu height="85" - label="New Body Parts" + label="New body parts" layout="topleft" left_delta="0" mouse_opaque="false" @@ -197,35 +240,4 @@ parameter="eyes" /> </menu_item_call> </menu> - <menu_item_separator name="sepatator2" /> - <menu_item_call - label="Edit Outfit" - layout="topleft" - name="edit"> - <on_click - function="Outfit.Edit" /> - <on_visible - function="Outfit.OnVisible" - parameter="edit" /> - </menu_item_call> - <menu_item_call - label="Rename Outfit" - layout="topleft" - name="rename"> - <on_click - function="Outfit.Rename" /> - <on_enable - function="Outfit.OnEnable" - parameter="rename" /> - </menu_item_call> - <menu_item_call - label="Delete Outfit" - layout="topleft" - name="delete"> - <on_click - function="Outfit.Delete" /> - <on_visible - function="Outfit.OnVisible" - parameter="delete" /> - </menu_item_call> </context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index 488b39de06..d8aac71dd5 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -144,6 +144,14 @@ parameter="rename" /> </menu_item_call> <menu_item_call + label="New Folder" + layout="topleft" + name="New Listing Folder"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="category" /> + </menu_item_call> + <menu_item_call label="New Outfit" layout="topleft" name="New Outfit"> @@ -264,7 +272,7 @@ layout="topleft" name="Folder Wearables Separator" /> <menu_item_call - label="Replace Current Outfit" + label="Replace current outfit" layout="topleft" name="Replace Outfit"> <menu_item_call.on_click @@ -272,7 +280,7 @@ parameter="replaceoutfit" /> </menu_item_call> <menu_item_call - label="Add To Current Outfit" + label="Add folder items" layout="topleft" name="Add To Outfit"> <menu_item_call.on_click @@ -280,7 +288,7 @@ parameter="addtooutfit" /> </menu_item_call> <menu_item_call - label="Remove From Current Outfit" + label="Take off folder items" layout="topleft" name="Remove From Outfit"> <menu_item_call.on_click diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml index 85eb941e31..8f36c7a00a 100644 --- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml @@ -4,7 +4,7 @@ visible="false" name="Gear Outfit"> <menu_item_call - label="Wear - Replace Current Outfit" + label="Replace current outfit" layout="topleft" name="wear"> <on_click @@ -17,7 +17,7 @@ parameter="wear" /> </menu_item_call> <menu_item_call - label="Wear - Add to Current Outfit" + label="Add outfit items" layout="topleft" name="wear_add"> <on_click @@ -25,9 +25,11 @@ <on_enable function="Gear.OnEnable" parameter="wear_add" /> + <on_visible + function="Gear.OnVisible"/> </menu_item_call> <menu_item_call - label="Take Off - Remove from Current Outfit" + label="Take off outfit items" layout="topleft" name="take_off"> <on_click @@ -39,19 +41,88 @@ function="Gear.OnVisible" parameter="take_off" /> </menu_item_call> + <menu_item_separator name="wear_separator" /> <menu_item_call label="Image..." layout="topleft" name="thumbnail"> + <on_click + function="Gear.Thumbnail" /> + </menu_item_call> + <menu_item_call + label="Rename outfit" + layout="topleft" + name="rename"> + <on_click + function="Gear.Rename" /> + <on_enable + function="Gear.OnEnable" + parameter="rename" /> + <on_visible + function="Gear.OnVisible" + parameter="rename" /> + </menu_item_call> + <menu_item_call + label="Save to this outfit" + layout="topleft" + name="save"> + <on_click + function="Gear.Save" /> + <on_visible + function="Gear.OnVisible"/> + </menu_item_call> + <menu_item_separator> + <on_visible + function="Gear.OnVisible" + parameter="delete" /> + </menu_item_separator> + <menu_item_call + label="Delete outfit" + layout="topleft" + name="delete_outfit"> + <on_click + function="Gear.Delete" /> + <on_enable + function="Gear.OnEnable" + parameter="delete" /> + <on_visible + function="Gear.OnVisible" + parameter="delete" /> + </menu_item_call> + <menu_item_separator> + <on_visible + function="Gear.OnVisible"/> + </menu_item_separator> + <menu_item_check + label="Sort folders always by name" + layout="topleft" + name="sort_folders_by_name"> + <on_click + function="Gear.SortByName" /> + <on_check + function="CheckControl" + parameter="OutfitGallerySortByName" /> + </menu_item_check> + <menu_item_call + label="Expand all folders" + layout="topleft" + name="expand"> + <on_click + function="Gear.Expand" /> + </menu_item_call> + <menu_item_call + label="Collapse all folders" + layout="topleft" + name="collapse"> <on_click - function="Gear.Thumbnail" /> + function="Gear.Collapse" /> </menu_item_call> - <menu_item_separator name="sepatator1" /> + <menu_item_separator/> <!-- copied (with minor modifications) from menu_inventory_add.xml --> <!-- *TODO: generate dynamically? --> <menu height="175" - label="New Clothes" + label="New clothes" layout="topleft" left_delta="0" mouse_opaque="false" @@ -165,7 +236,7 @@ </menu> <menu height="85" - label="New Body Parts" + label="New body parts" layout="topleft" left_delta="0" mouse_opaque="false" @@ -206,57 +277,4 @@ </menu_item_call> </menu> <!-- copied from menu_inventory_add.xml --> - - <menu_item_separator name="sepatator2" /> - <menu_item_call - label="Expand all folders" - layout="topleft" - name="expand"> - <on_click - function="Gear.Expand" /> - </menu_item_call> - <menu_item_call - label="Collapse all folders" - layout="topleft" - name="collapse"> - <on_click - function="Gear.Collapse" /> - </menu_item_call> - <menu_item_call - label="Rename Outfit" - layout="topleft" - name="rename"> - <on_click - function="Gear.Rename" /> - <on_enable - function="Gear.OnEnable" - parameter="rename" /> - <on_visible - function="Gear.OnVisible" - parameter="rename" /> - </menu_item_call> - <menu_item_call - label="Delete Outfit" - layout="topleft" - name="delete_outfit"> - <on_click - function="Gear.Delete" /> - <on_enable - function="Gear.OnEnable" - parameter="delete" /> - <on_visible - function="Gear.OnVisible" - parameter="delete" /> - </menu_item_call> - <menu_item_separator name="sepatator3" /> - <menu_item_check - label="Sort Folders Always by Name" - layout="topleft" - name="sort_folders_by_name"> - <on_click - function="Gear.SortByName" /> - <on_check - function="CheckControl" - parameter="OutfitGallerySortByName" /> - </menu_item_check> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml index ae5fae864d..c6805edd63 100644 --- a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml @@ -3,7 +3,7 @@ layout="topleft" name="Outfit"> <menu_item_call - label="Wear - Replace Current Outfit" + label="Replace current outfit" layout="topleft" name="wear_replace"> <on_click @@ -16,7 +16,7 @@ parameter="wear_replace" /> </menu_item_call> <menu_item_call - label="Wear - Add to Current Outfit" + label="Add outfit items" layout="topleft" name="wear_add"> <on_click @@ -29,7 +29,7 @@ parameter="wear_add" /> </menu_item_call> <menu_item_call - label="Take Off - Remove from Current Outfit" + label="Take off outfit items" layout="topleft" name="take_off"> <on_click @@ -41,19 +41,26 @@ function="Outfit.OnVisible" parameter="take_off" /> </menu_item_call> + <menu_item_separator /> <menu_item_call - label="Edit Outfit" - layout="topleft" - name="edit"> + label="Image..." + layout="topleft" + name="thumbnail"> + <on_click + function="Outfit.Thumbnail" /> + </menu_item_call> + <menu_item_call + label="Edit outfit" + layout="topleft" + name="edit"> <on_click function="Outfit.Edit" /> <on_visible function="Outfit.OnVisible" parameter="edit" /> </menu_item_call> - <menu_item_separator /> <menu_item_call - label="Rename Outfit" + label="Rename outfit" layout="topleft" name="rename"> <on_click @@ -63,7 +70,19 @@ parameter="rename" /> </menu_item_call> <menu_item_call - label="Delete Outfit" + label="Save to this outfit" + layout="topleft" + name="save"> + <on_click + function="Outfit.Save" /> + </menu_item_call> + <menu_item_separator> + <on_visible + function="Outfit.OnVisible" + parameter="delete" /> + </menu_item_separator> + <menu_item_call + label="Delete outfit" layout="topleft" name="delete"> <on_click diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml index 910a0adc28..e4e86bb911 100644 --- a/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml @@ -49,4 +49,17 @@ function="TeleportHistory.GearMenu.Enable" parameter="copy_slurl" /> </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Remove from history" + layout="topleft" + name="remove_from_history"> + <on_click + function="TeleportHistory.GearMenu.Action" + parameter="remove" /> + <on_enable + function="TeleportHistory.GearMenu.Enable" + parameter="remove" /> + </menu_item_call> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 26dea3d9d3..c7a33e116b 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -399,6 +399,16 @@ function="Self.EnableRemoveAllAttachments" /> </menu_item_call> </menu> + <menu_item_call + label="Remove selected attachments" + layout="topleft" + name="Remove Selected Attachments" + shortcut="alt|shift|R"> + <menu_item_call.on_click + function="Attachment.Detach" /> + <menu_item_call.on_enable + function="Attachment.EnableDetach" /> + </menu_item_call> <menu_item_separator/> <menu_item_call label="Complete avatars..." @@ -750,6 +760,33 @@ function="Floater.Show" parameter="360capture" /> </menu_item_call> + <menu + create_jump_keys="true" + label="Zoom level" + name="Zoom menu" + tear_off="true"> + <menu_item_call + label="Zoom out" + name="Zoom Out" + shortcut="control|8"> + <menu_item_call.on_click + function="View.ZoomOut" /> + </menu_item_call> + <menu_item_call + label="Default" + name="Zoom Default" + shortcut="control|9"> + <menu_item_call.on_click + function="View.ZoomDefault" /> + </menu_item_call> + <menu_item_call + label="Zoom in" + name="Zoom In" + shortcut="control|0"> + <menu_item_call.on_click + function="View.ZoomIn" /> + </menu_item_call> + </menu> <menu_item_separator/> <menu_item_call label="Place profile" @@ -2391,29 +2428,6 @@ function="World.EnvPreset" function="View.EnableLastChatter" /> </menu_item_call> - <menu_item_separator/> - - <menu_item_call - label="Zoom In" - name="Zoom In" - shortcut="control|0"> - <menu_item_call.on_click - function="View.ZoomIn" /> - </menu_item_call> - <menu_item_call - label="Zoom Default" - name="Zoom Default" - shortcut="control|9"> - <menu_item_call.on_click - function="View.ZoomDefault" /> - </menu_item_call> - <menu_item_call - label="Zoom Out" - name="Zoom Out" - shortcut="control|8"> - <menu_item_call.on_click - function="View.ZoomOut" /> - </menu_item_call> </menu> <!--Shortcuts--> <menu_item_separator/> @@ -3552,6 +3566,21 @@ function="World.EnvPreset" function="Advanced.WebContentTest" parameter="http://duckduckgo.com"/> </menu_item_call> + <menu_item_call + label="Inventory Thumbnails Helper" + name="Inventory Thumbnails Helper" + shortcut="control|alt|shift|X"> + <menu_item_call.on_click + function="Floater.Show" + parameter="inventory_thumbnails_helper" /> + </menu_item_call> + <menu_item_call + label="FB Connect Test" + name="FB Connect Test"> + <menu_item_call.on_click + function="Advanced.WebContentTest" + parameter="https://cryptic-ridge-1632.herokuapp.com/"/> + </menu_item_call> <menu_item_call label="Dump Fonts" name="Dump Fonts"> @@ -3641,6 +3670,14 @@ function="World.EnvPreset" function="Advanced.ToggleDebugUnicode" /> </menu_item_check> <menu_item_check + label="Debug Camera Controls" + name="Debug Camera Controls"> + <menu_item_check.on_check + function="Advanced.CheckDebugCamera" /> + <menu_item_check.on_click + function="Advanced.ToggleDebugCamera" /> + </menu_item_check> + <menu_item_check label="Debug Name Tooltips" name="Debug Name Tooltips"> <menu_item_check.on_check diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 3ca284b0fa..7d237c6edd 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -415,6 +415,15 @@ Initialization with the Marketplace failed because of a system or network error. </notification> <notification + icon="notifytip.tga" + name="InvalidKeystroke" + type="notifytip"> +There was an invalid keystroke entered. +[REASON]. +Please input a valid text. + </notification> + + <notification icon="alertmodal.tga" name="MerchantForceValidateListing" type="alertmodal"> @@ -4400,14 +4409,28 @@ Are you sure you want to return the selected objects to their owners? Transferab icon="alert.tga" name="GroupLeaveConfirmMember" type="alert"> -You are currently a member of the group <nolink>[GROUP]</nolink>. -Leave Group? +Leave the group '<nolink>[GROUP]</nolink>'? +Currently, the fee to join this "group" is L$ [COST]. <tag>group</tag> <tag>confirm</tag> <usetemplate name="okcancelbuttons" notext="Cancel" - yestext="OK"/> + yestext="Leave"/> + </notification> + + <notification + icon="alert.tga" + name="GroupLeaveConfirmMemberNoFee" + type="alert"> +Leave the group '<nolink>[GROUP]</nolink>'? +There is currently no fee to join this group. + <tag>group</tag> + <tag>confirm</tag> + <usetemplate + name="okcancelbuttons" + notext="Cancel" + yestext="Leave"/> </notification> @@ -6170,6 +6193,33 @@ Are you sure you want to delete them? notext="Cancel" yestext="OK"/> </notification> + + <notification + icon="alertmodal.tga" + name="DeleteWornItems" + type="alertmodal"> + <unique/> +Some item(s) you wish to delete are being worn on your avatar. +Remove these items from your avatar? + <tag>confirm</tag> + <usetemplate + name="okcancelbuttons" + notext="Cancel" + yestext="Remove item(s) and delete"/> + </notification> + + <notification + icon="alertmodal.tga" + name="CantDeleteRequiredClothing" + type="alertmodal"> + <unique/> +Some item(s) you wish to delete are required clothing layers (skin, shape, hair, eyes). +You must replace those layers before deleting them. + <tag>confirm</tag> + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> <notification icon="alertmodal.tga" @@ -6458,14 +6508,6 @@ Your trash is overflowing. This may cause problems logging in. </notification> <notification - icon="notifytip.tga" - name="InventoryLimitReachedAIS" - type="notifytip"> -Your inventory is experiencing issues. Please, contact support. - <tag>fail</tag> - </notification> - - <notification icon="alertmodal.tga" name="InventoryLimitReachedAISAlert" type="alertmodal"> @@ -12254,6 +12296,50 @@ Would you like to save them first? notext="No" yestext="Yes"/> </notification> + + <notification + icon="alertmodal.tga" + name="ConfirmOverwriteOutfit" + type="alertmodal"> + <unique/> +This will replace the items in the +selected outfit with the items you +are wearing now. + <tag>confirm</tag> + <usetemplate + ignoretext="Confirm before overwriting outfit" + name="okcancelignore" + notext="Cancel" + yestext="Save"/> + </notification> + + <notification + icon="alertmodal.tga" + name="ClearInventoryThumbnailsWarning" + type="alertmodal"> + You are about to remove thumbnail images from the inventory items in the list. This change cannot be undone. + + Would you like to proceed? + <tag>confirm</tag> + <usetemplate + name="okcancelbuttons" + notext="No" + yestext="Yes"/> + </notification> + + <notification + icon="alertmodal.tga" + name="WriteInventoryThumbnailsWarning" + type="alertmodal"> + You are about to overwrite thumbnail images for some or all of the inventory items in the list. This change cannot be undone. + + Would you like to proceed? + <tag>confirm</tag> + <usetemplate + name="okcancelbuttons" + notext="No" + yestext="Yes"/> + </notification> <notification icon="notifytip.tga" diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml index 347efa50da..4d2069c9fe 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml @@ -260,7 +260,7 @@ left="10" max_length_bytes="63" name="description" - prevalidate_callback="ascii" + prevalidator="ascii" select_on_focus="true" text_color="Black" top_pad="3" 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 3043a30dcb..7290cbb5c6 100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml @@ -65,7 +65,7 @@ Hover your mouse over the options for more help. width="168" /> <text font="SansSerifMedium" - text_color="EmphasisColor" + text_color="white" type="string" follows="left|top" height="16" @@ -75,14 +75,14 @@ Hover your mouse over the options for more help. top_pad="10" visible="true" width="190"> - Free + No charge to join </text> <button follows="left|top" left_delta="0" top_pad="6" height="23" - label="JOIN NOW!" + label="Join group" name="btn_join" visible="true" width="120" /> 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 cc50c6202f..ad9dbd1156 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 @@ -22,10 +22,10 @@ background_visible="true" name="group_join_btn"> Join (L$[AMOUNT]) </panel.string> - <panel.string - name="group_join_free"> - Free - </panel.string> + <panel.string name="group_join_free">No charge to join</panel.string> + <panel.string name="group_member">You are a member</panel.string> + <panel.string name="join_txt">Join group</panel.string> + <panel.string name="leave_txt">Leave</panel.string> <panel name="group_info_top" follows="top|left" 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 9e31ff604a..ff6af88707 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 @@ -49,6 +49,18 @@ value="Unknown" width="242" /> <button + name="notices_btn" + tool_tip="Group Notices" + top_delta="-4" + left_pad="3" + right="-53" + height="20" + width="20" + follows="right" + image_pressed="Group_Notices" + image_unselected="Group_Notices" + tab_stop="false"/> + <button follows="right" height="16" image_pressed="Info_Press" @@ -58,7 +70,7 @@ name="info_btn" tool_tip="More info" tab_stop="false" - top_delta="-2" + top_delta="2" width="16" /> <!--*TODO: Should only appear on rollover--> <button @@ -71,6 +83,6 @@ name="profile_btn" tab_stop="false" tool_tip="View profile" - top_delta="-2" + top_delta="0" width="20" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml b/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml index 6a1466867d..c33c9659cf 100644 --- a/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml +++ b/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml @@ -54,9 +54,22 @@ use_ellipses="true" /> <button + name="notices_btn" + tool_tip="Group Notices" + top_delta="-4" + left_pad="3" + right="-80" + height="20" + width="20" + follows="right" + image_pressed="Group_Notices" + image_unselected="Group_Notices" + tab_stop="false" + visible="false"/> + <button name="visibility_hide_btn" tool_tip="Hide group on my profile" - top_delta="-3" + top_delta="0" left_pad="3" right="-53" height="20" diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml index 0131f1d97d..1162dcf20d 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml @@ -141,7 +141,7 @@ Maximum 200 per group daily left_pad="3" max_length_bytes="63" name="create_subject" - prevalidate_callback="ascii" + prevalidator="ascii" spellcheck="true" width="218" /> <text 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 2fbf322019..af68bd7fee 100644 --- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml @@ -308,7 +308,7 @@ left="0" max_length_bytes="63" name="title_editor" - prevalidate_callback="ascii" + prevalidator="ascii" text_readonly_color="white" top_delta="1" width="290"/> @@ -332,7 +332,7 @@ read_only="true" spellcheck="true" text_readonly_color="white" - text_type="ascii_with_newline" + prevalidator="ascii_with_newline" top_pad="5" width="290" wrap="true" /> diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 8a8384bc2d..27b74a46ce 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -55,7 +55,7 @@ combo_editor.font="SansSerifLarge" max_chars="128" combo_editor.commit_on_focus_lost="false" - combo_editor.prevalidate_callback="ascii" + combo_editor.prevalidator="ascii" tool_tip="The username you chose when you registered, like bobsmith12 or Steller Sunshine" name="username_combo" width="206"> diff --git a/indra/newview/skins/default/xui/en/panel_login_first.xml b/indra/newview/skins/default/xui/en/panel_login_first.xml index d002e24782..d6ac71db94 100644 --- a/indra/newview/skins/default/xui/en/panel_login_first.xml +++ b/indra/newview/skins/default/xui/en/panel_login_first.xml @@ -112,7 +112,7 @@ combo_editor.font="SansSerifLarge" max_chars="128" top="0" - combo_editor.prevalidate_callback="ascii" + combo_editor.prevalidator="ascii" tool_tip="The username you chose when you registered, like bobsmith12 or Steller Sunshine" name="username_combo" width="232"> @@ -179,7 +179,6 @@ control_name="RememberPassword" follows="left|top" font="SansSerifLarge" - text_color="EmphasisColor" height="24" left="262" bottom_delta="0" diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml index 190ff4ef28..498dab1ef3 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -219,6 +219,7 @@ tab_height="30" tab_position="top" tab_min_width="100" + use_tab_offset="true" top="0"> <inventory_panel bg_opaque_color="DkGray2" diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml index 56d8714064..bfe738f472 100644 --- a/indra/newview/skins/default/xui/en/panel_notification.xml +++ b/indra/newview/skins/default/xui/en/panel_notification.xml @@ -32,21 +32,6 @@ <text border_visible="false" follows="left|right|top|bottom" - font="SansSerif" - height="85" - layout="topleft" - left="10" - name="text_box" - read_only="true" - text_color="White" - top="10" - visible="false" - width="285" - wrap="true"/> - <text - border_visible="false" - follows="left|right|top|bottom" - font="SansSerifBold" height="85" layout="topleft" left="10" @@ -57,14 +42,13 @@ width="285" wrap="true"/> <text_editor - h_pad="0" - v_pad="0" + h_pad="0" + v_pad="0" bg_readonly_color="Transparent" border_visible="false" embedded_items="false" enabled="false" follows="left|right|top|bottom" - font="SansSerif" height="85" layout="topleft" left="10" diff --git a/indra/newview/skins/default/xui/en/panel_profile_classified.xml b/indra/newview/skins/default/xui/en/panel_profile_classified.xml index 3d61eecf86..1c42a9ed33 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_classified.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_classified.xml @@ -483,7 +483,7 @@ layout="topleft" font="SansSerif" max_length_bytes="30" - prevalidate_callback="ascii" + prevalidator="ascii" commit_on_focus_lost="false" text_color="black" /> diff --git a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml index f596b876ab..6554dd0952 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml @@ -19,9 +19,10 @@ layout="topleft" visible="false" /> - <thumbnail + <profile_image name="real_world_pic" image_name="Generic_Person_Large" + show_loading="false" follows="top|left" layout="topleft" top="10" diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml index dd9a146265..e361a0f28c 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml @@ -5,7 +5,7 @@ top="0" left="0" height="480" - width="420" + width="440" follows="all" layout="topleft" > @@ -14,8 +14,11 @@ so display it as an UTC+0 --> <string - name="date_format" + name="date_format_full" value="SL birthdate: [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]" /> + <string + name="date_format_short" + value="SL birthdate: [mth,datetime,utc] [day,datetime,utc]" /> <string name="age_format" value="[AGE]" /> @@ -53,7 +56,7 @@ Account: [ACCTTYPE] top="8" left="6" bottom="-1" - width="160" + width="180" border_size="0" follows="left|top|bottom" layout="topleft" @@ -68,9 +71,10 @@ Account: [ACCTTYPE] auto_resize="false" user_resize="false"> - <thumbnail + <profile_image name="2nd_life_pic" image_name="Generic_Person_Large" + show_loading="false" layout="topleft" follows="all" interactable="true" @@ -322,74 +326,81 @@ Account: [ACCTTYPE] visible="true"/> </layout_panel> <layout_panel + name="menu_panel" + follows="all" + layout="topleft" + height="55" + auto_resize="false" + user_resize="false"> + <menu_button + layout="topleft" + follows="left|top" + left="1" + top="25" + height="25" + width="176" + label="Actions" + halign="left" + image_unselected="DropDown_Off" + image_selected="DropDown_On" + image_pressed="DropDown_Press" + image_pressed_selected="DropDown_Press" + image_disabled="DropDown_Disabled" + name="agent_actions_menu"/> + </layout_panel> + <layout_panel name="settings_panel" follows="all" layout="topleft" - height="50" + height="70" auto_resize="false" user_resize="false"> <!-- only for self --> - <text - name="search_label" - value="Show my profile in search:" - top="1" - left="6" - right="-1" - height="16" - follows="left|top|right" - layout="topleft"/> <combo_box name="show_in_search" tool_tip="Let people see you in search results" left="1" - top="18" - height="23" - width="140" + top="5" + height="25" + width="176" follows="left|top" layout="topleft" - visible="true" enabled="false"> <combo_box.item - name="Hide" - label="Hide" - value="0" /> - <combo_box.item name="Show" - label="Show" + label="Show me in search" value="1" /> + <combo_box.item + name="Hide" + label="Don't show me in search" + value="0" /> </combo_box> - </layout_panel> - - <layout_panel - name="menu_panel" - follows="all" - layout="topleft" - height="55" - auto_resize="false" - user_resize="false" - > - <menu_button - layout="topleft" - follows="left|top" + <combo_box + name="hide_age" + tool_tip="Let people see your SL age" left="1" - top="25" + top="40" height="25" - width="140" - label="Actions" - halign="left" - image_unselected="DropDown_Off" - image_selected="DropDown_On" - image_pressed="DropDown_Press" - image_pressed_selected="DropDown_Press" - image_disabled="DropDown_Disabled" - name="agent_actions_menu" /> + width="176" + follows="left|top" + layout="topleft" + enabled="false"> + <combo_box.item + name="Show" + label="Show birthdate + SL age" + value="0"/> + <combo_box.item + name="Hide" + label="Show month + day only" + value="1"/> + </combo_box> </layout_panel> </layout_stack> <layout_stack name="main_stack" top="8" - left="168" + left="188" bottom="-1" right="-1" follows="all" diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml index bec4f7852f..5e65b0e8a2 100644 --- a/indra/newview/skins/default/xui/en/panel_settings_water.xml +++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml @@ -65,7 +65,7 @@ Density Exponent: </text> <slider - decimal_digits="1" + decimal_digits="2" follows="left|top" height="16" increment="0.01" diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml index bdb4b545c1..1cb3eca2eb 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml @@ -208,7 +208,7 @@ TestString PleaseIgnore Description: </text> <text_editor - text_type="ascii_printable_no_pipe" + prevalidator="ascii_printable_no_pipe" commit_on_focus_lost="true" border_style="line" border_thickness="1" diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml index 1276f3bad3..45bc73a0b7 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml @@ -286,13 +286,13 @@ name="Zoom" value="Zoom" /> <combo_box.item - label="Ignore object" - name="Ignoreobject" - value="Ignore" /> - <combo_box.item label="None" name="None" value="None" /> + <combo_box.item + label="Ignore object" + name="Ignoreobject" + value="Ignore" /> </combo_box> <panel border="false" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index b1feb7368f..bee58da6b0 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -580,7 +580,21 @@ http://secondlife.com/support for help fixing this problem. <string name="script_files">Scripts</string> <string name="dictionary_files">Dictionaries</string> - <!-- LSL Usage Hover Tips --> + <!-- Text validator error messages --> + <string name="Validator_InvalidNumericString">Invalid numeric string: "[STR]"</string> + <string name="Validator_ShouldNotBeMinus">Invalid initial character: '[CH]' (shouldn't be a minus)</string> + <string name="Validator_ShouldNotBeMinusOrZero">Invalid initial character: '[CH]' (shouldn't be either a minus or a zero)</string> + <string name="Validator_ShouldBeDigit">Invalid character [NR]: '[CH]' (should only be a digit)</string> + <string name="Validator_ShouldBeDigitOrDot">Invalid character [NR]: '[CH]' (should only be a digit or a decimal point)</string> + <string name="Validator_ShouldBeDigitOrAlpha">Invalid character [NR]: '[CH]' (should only be a digit or an alpha-numeric ASCII character)</string> + <string name="Validator_ShouldBeDigitOrAlphaOrSpace">Invalid character [NR]: '[CH]' (should only be a digit or an alpha-numeric ASCII character or a space)</string> + <string name="Validator_ShouldBeDigitOrAlphaOrPunct">Invalid character [NR]: '[CH]' (should only be a digit or an alpha-numeric ASCII character or a punctuation)</string> + <string name="Validator_ShouldBeDigitOrAlphaOrPunctNotSpace">Invalid character [NR]: '[CH]' (should only be a digit or an alpha-numeric ASCII character or a punctuation with no space)</string> + <string name="Validator_ShouldBeDigitNotSpace">Invalid character [NR]: '[CH]' (should only be a digit with no space)</string> + <string name="Validator_ShouldBeASCII">Invalid character [NR]: '[CH]' (should only be an ASCII character)</string> + <string name="Validator_ShouldBeNewLineOrASCII">Invalid character [NR]: '[CH]' (should only be an ASCII character or a new line)</string> + + <!-- LSL Usage Hover Tips --> <!-- NOTE: For now these are set as translate="false", until DEV-40761 is implemented (to internationalize the rest of tooltips in the same window). This has no effect on viewer code, but prevents Linden Lab internal localization tool from scraping these strings. --> <string name="LSLTipSleepTime" translate="false"> @@ -3946,7 +3960,8 @@ Abuse Report</string> <string name="dance8">dance8</string> <!-- birth date format shared by avatar inspector and profile panels --> - <string name="AvatarBirthDateFormat">[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]</string> + <string name="AvatarBirthDateFormatFull">[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]</string> + <string name="AvatarBirthDateFormatShort">[mthnum,datetime,slt]/[day,datetime,slt]</string> <string name="DefaultMimeType">none/none</string> <string name="texture_load_dimensions_error">Can't load images larger than [WIDTH]*[HEIGHT]</string> @@ -4013,7 +4028,8 @@ Please check http://status.secondlifegrid.net to see if there is a known problem <string name="EmptyOutfitText">There are no items in this outfit</string> <!-- External editor status codes --> - <string name="ExternalEditorNotSet">Select an editor by setting the environment variable LL_SCRIPT_EDITOR or the ExternalEditor setting.</string> + <string name="ExternalEditorNotSet">Select an editor by setting the environment variable LL_SCRIPT_EDITOR or the ExternalEditor setting. +See https://wiki.secondlife.com/wiki/LSL_Alternate_Editors</string> <string name="ExternalEditorNotFound">Cannot find the external editor you specified. Try enclosing path to the editor with double quotes. (e.g. "/path to my/editor" "%s")</string> 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 d37bee27ba..ae642e1da5 100644 --- a/indra/newview/skins/default/xui/en/widgets/line_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/line_editor.xml @@ -15,5 +15,5 @@ preedit_bg_color="White" mouse_opaque="true" name="line_editor" - font="SansSerifSmall"> + font="EmojiSmall"> </line_editor> diff --git a/indra/newview/skins/default/xui/it/emoji_categories.xml b/indra/newview/skins/default/xui/it/emoji_categories.xml index a4782e60a6..b447a5b78b 100644 --- a/indra/newview/skins/default/xui/it/emoji_categories.xml +++ b/indra/newview/skins/default/xui/it/emoji_categories.xml @@ -5,7 +5,7 @@ <key>Name</key> <string>smileys and emotion</string> <key>Category</key> - <string>smileys and emozione</string> + <string>smileys & emozione</string> </map> <map> <key>Name</key> @@ -23,7 +23,7 @@ <key>Name</key> <string>animals and nature</string> <key>Category</key> - <string>animali and natura</string> + <string>animali & natura</string> </map> <map> <key>Name</key> @@ -35,7 +35,7 @@ <key>Name</key> <string>travel and places</string> <key>Category</key> - <string>viaggi and luoghi</string> + <string>viaggi & luoghi</string> </map> <map> <key>Name</key> diff --git a/indra/newview/skins/default/xui/pl/emoji_categories.xml b/indra/newview/skins/default/xui/pl/emoji_categories.xml index 9aad7af794..42f8e2eb4a 100644 --- a/indra/newview/skins/default/xui/pl/emoji_categories.xml +++ b/indra/newview/skins/default/xui/pl/emoji_categories.xml @@ -5,13 +5,13 @@ <key>Name</key> <string>smileys and emotion</string> <key>Category</key> - <string>buźki and emocje</string> + <string>buźki & emocje</string> </map> <map> <key>Name</key> <string>people and body</string> <key>Category</key> - <string>ludzie and ciało</string> + <string>ludzie & ciało</string> </map> <map> <key>Name</key> @@ -23,7 +23,7 @@ <key>Name</key> <string>animals and nature</string> <key>Category</key> - <string>zwierzęta and przyroda</string> + <string>zwierzęta & przyroda</string> </map> <map> <key>Name</key> @@ -35,7 +35,7 @@ <key>Name</key> <string>travel and places</string> <key>Category</key> - <string>podróże and miejsca</string> + <string>podróże & miejsca</string> </map> <map> <key>Name</key> |
