From b82d70cf2aa2b56a2c0bfdd941ee4f74e690e4df Mon Sep 17 00:00:00 2001 From: Kadah_Coba Date: Mon, 4 Mar 2019 00:18:45 -0800 Subject: Added viewer based profiles Split picks and classifieds in to separate panels Moved getProfileURL to LLAvatarActions Removed dead XUI panels Removed picks/classifieds floater --- indra/newview/skins/default/xui/da/panel_me.xml | 7 - .../skins/default/xui/da/panel_side_tray.xml | 29 - .../newview/skins/default/xui/de/floater_picks.xml | 2 - indra/newview/skins/default/xui/de/panel_me.xml | 4 - .../newview/skins/default/xui/en/floater_picks.xml | 21 - .../skins/default/xui/en/floater_profile.xml | 119 ++++ indra/newview/skins/default/xui/en/menu_viewer.xml | 3 +- .../default/xui/en/panel_group_list_item_short.xml | 83 +++ indra/newview/skins/default/xui/en/panel_me.xml | 19 - .../default/xui/en/panel_profile_classified.xml | 711 +++++++++++++++++++++ .../default/xui/en/panel_profile_classifieds.xml | 76 +++ .../default/xui/en/panel_profile_firstlife.xml | 59 ++ .../default/xui/en/panel_profile_interests.xml | 250 ++++++++ .../skins/default/xui/en/panel_profile_notes.xml | 86 +++ .../skins/default/xui/en/panel_profile_pick.xml | 109 ++++ .../skins/default/xui/en/panel_profile_picks.xml | 87 +++ .../default/xui/en/panel_profile_secondlife.xml | 512 +++++++++++++++ .../skins/default/xui/en/panel_profile_web.xml | 92 +++ indra/newview/skins/default/xui/en/strings.xml | 12 +- .../newview/skins/default/xui/es/floater_picks.xml | 2 - indra/newview/skins/default/xui/es/panel_me.xml | 4 - .../newview/skins/default/xui/fr/floater_picks.xml | 2 - indra/newview/skins/default/xui/fr/panel_me.xml | 4 - .../newview/skins/default/xui/it/floater_picks.xml | 2 - indra/newview/skins/default/xui/it/panel_me.xml | 4 - .../newview/skins/default/xui/ja/floater_picks.xml | 2 - indra/newview/skins/default/xui/ja/panel_me.xml | 4 - .../newview/skins/default/xui/pl/floater_picks.xml | 2 - indra/newview/skins/default/xui/pl/panel_me.xml | 4 - .../newview/skins/default/xui/pt/floater_picks.xml | 2 - indra/newview/skins/default/xui/pt/panel_me.xml | 4 - .../newview/skins/default/xui/ru/floater_picks.xml | 2 - indra/newview/skins/default/xui/ru/panel_me.xml | 4 - .../newview/skins/default/xui/tr/floater_picks.xml | 2 - indra/newview/skins/default/xui/tr/panel_me.xml | 4 - .../newview/skins/default/xui/zh/floater_picks.xml | 2 - indra/newview/skins/default/xui/zh/panel_me.xml | 4 - 37 files changed, 2193 insertions(+), 142 deletions(-) delete mode 100644 indra/newview/skins/default/xui/da/panel_me.xml delete mode 100644 indra/newview/skins/default/xui/da/panel_side_tray.xml delete mode 100644 indra/newview/skins/default/xui/de/floater_picks.xml delete mode 100644 indra/newview/skins/default/xui/de/panel_me.xml delete mode 100644 indra/newview/skins/default/xui/en/floater_picks.xml create mode 100644 indra/newview/skins/default/xui/en/floater_profile.xml create mode 100644 indra/newview/skins/default/xui/en/panel_group_list_item_short.xml delete mode 100644 indra/newview/skins/default/xui/en/panel_me.xml create mode 100644 indra/newview/skins/default/xui/en/panel_profile_classified.xml create mode 100644 indra/newview/skins/default/xui/en/panel_profile_classifieds.xml create mode 100644 indra/newview/skins/default/xui/en/panel_profile_firstlife.xml create mode 100644 indra/newview/skins/default/xui/en/panel_profile_interests.xml create mode 100644 indra/newview/skins/default/xui/en/panel_profile_notes.xml create mode 100644 indra/newview/skins/default/xui/en/panel_profile_pick.xml create mode 100644 indra/newview/skins/default/xui/en/panel_profile_picks.xml create mode 100644 indra/newview/skins/default/xui/en/panel_profile_secondlife.xml create mode 100644 indra/newview/skins/default/xui/en/panel_profile_web.xml delete mode 100644 indra/newview/skins/default/xui/es/floater_picks.xml delete mode 100644 indra/newview/skins/default/xui/es/panel_me.xml delete mode 100644 indra/newview/skins/default/xui/fr/floater_picks.xml delete mode 100644 indra/newview/skins/default/xui/fr/panel_me.xml delete mode 100644 indra/newview/skins/default/xui/it/floater_picks.xml delete mode 100644 indra/newview/skins/default/xui/it/panel_me.xml delete mode 100644 indra/newview/skins/default/xui/ja/floater_picks.xml delete mode 100644 indra/newview/skins/default/xui/ja/panel_me.xml delete mode 100644 indra/newview/skins/default/xui/pl/floater_picks.xml delete mode 100644 indra/newview/skins/default/xui/pl/panel_me.xml delete mode 100644 indra/newview/skins/default/xui/pt/floater_picks.xml delete mode 100644 indra/newview/skins/default/xui/pt/panel_me.xml delete mode 100644 indra/newview/skins/default/xui/ru/floater_picks.xml delete mode 100644 indra/newview/skins/default/xui/ru/panel_me.xml delete mode 100644 indra/newview/skins/default/xui/tr/floater_picks.xml delete mode 100644 indra/newview/skins/default/xui/tr/panel_me.xml delete mode 100644 indra/newview/skins/default/xui/zh/floater_picks.xml delete mode 100644 indra/newview/skins/default/xui/zh/panel_me.xml (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/da/panel_me.xml b/indra/newview/skins/default/xui/da/panel_me.xml deleted file mode 100644 index f98ced5f91..0000000000 --- a/indra/newview/skins/default/xui/da/panel_me.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/indra/newview/skins/default/xui/da/panel_side_tray.xml b/indra/newview/skins/default/xui/da/panel_side_tray.xml deleted file mode 100644 index 66c3e69904..0000000000 --- a/indra/newview/skins/default/xui/da/panel_side_tray.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/indra/newview/skins/default/xui/de/floater_picks.xml b/indra/newview/skins/default/xui/de/floater_picks.xml deleted file mode 100644 index 2521920e83..0000000000 --- a/indra/newview/skins/default/xui/de/floater_picks.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/indra/newview/skins/default/xui/de/panel_me.xml b/indra/newview/skins/default/xui/de/panel_me.xml deleted file mode 100644 index f49446fbbf..0000000000 --- a/indra/newview/skins/default/xui/de/panel_me.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/indra/newview/skins/default/xui/en/floater_picks.xml b/indra/newview/skins/default/xui/en/floater_picks.xml deleted file mode 100644 index 984894b016..0000000000 --- a/indra/newview/skins/default/xui/en/floater_picks.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - diff --git a/indra/newview/skins/default/xui/en/floater_profile.xml b/indra/newview/skins/default/xui/en/floater_profile.xml new file mode 100644 index 0000000000..af70ba66f0 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_profile.xml @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + Date: Tue, 16 Apr 2019 03:51:05 -0700 Subject: Added spotlight and phantom support to copy/paste Added paste options menu --- .../newview/skins/default/xui/en/floater_tools.xml | 23 +++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 1e2846d943..8a7272d9e4 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -1696,25 +1696,38 @@ even though the user gets a free copy. --> + Date: Wed, 17 Apr 2019 02:41:33 -0700 Subject: Added translation support for build tools paste buttons tooltips --- indra/newview/skins/default/xui/en/floater_tools.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 8a7272d9e4..150d3d9804 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -1387,6 +1387,18 @@ even though the user gets a free copy. name="Object" top="16" width="295"> + +Paste Position +[VALUE] + + +Paste Size +[VALUE] + + +Paste Rotation +[VALUE] + Date: Thu, 18 Apr 2019 19:26:37 +0300 Subject: SL-10791 [Legacy Profiles] Functionality to copy agent id and name from profile --- .../skins/default/xui/en/menu_name_field.xml | 22 ++++++++++ .../default/xui/en/panel_profile_secondlife.xml | 48 +++++++++++++++++----- 2 files changed, 60 insertions(+), 10 deletions(-) create mode 100644 indra/newview/skins/default/xui/en/menu_name_field.xml (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/menu_name_field.xml b/indra/newview/skins/default/xui/en/menu_name_field.xml new file mode 100644 index 0000000000..3c5e5dd353 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_name_field.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + 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 8ebb1522b4..e577e6a4d2 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml @@ -112,23 +112,51 @@ layout="topleft" visible="false" /> - + border_visible="false"> + + + + Date: Thu, 18 Apr 2019 23:39:12 -0700 Subject: Build tools paste options menu --- .../skins/default/xui/en/menu_build_paste.xml | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 indra/newview/skins/default/xui/en/menu_build_paste.xml (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/menu_build_paste.xml b/indra/newview/skins/default/xui/en/menu_build_paste.xml new file mode 100644 index 0000000000..f63362dabf --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_build_paste.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 6d64ba263079546198bd8c4e1890eb39c4eb3a0c Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Wed, 24 Apr 2019 18:54:50 +0300 Subject: SL-11023 [Legacy Profiles] Selection is too low in some field of profile floater --- indra/newview/skins/default/xui/en/panel_group_list_item_short.xml | 2 +- indra/newview/skins/default/xui/en/panel_profile_secondlife.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/skins/default/xui') 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 e15e050fe1..fb46d1cce3 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 @@ -43,7 +43,7 @@ @@ -287,10 +287,10 @@ bg_visible="false" border_visible="true" parse_urls="true" - h_pad="0" + h_pad="1" read_only="true" translate="false" - v_pad="2" + v_pad="4" max_length="254" /> -- cgit v1.2.3 From 04eee0ac24de1bf1744ed7a8707a847961fe7192 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Thu, 25 Apr 2019 16:07:20 +0300 Subject: SL-11031 [Legacy Profiles] "Drop inventory" field visible for own profile --- .../default/xui/en/panel_profile_secondlife.xml | 150 ++++++++++++--------- 1 file changed, 90 insertions(+), 60 deletions(-) (limited to 'indra/newview/skins/default/xui') 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 a5f486d4a1..f7d3353786 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml @@ -322,76 +322,106 @@ name="group_list" top_delta="-20" left="66" - right="-6" - height="80" + right="-7" + height="82" follows="left|top|right" layout="topleft" border_visible="true" color="ScrollBgWriteableColor" for_agent="false" /> - - - - - - Drop inventory item here. - + + + + + + + + + Drop inventory item here. + + + Date: Tue, 25 Jun 2019 17:54:21 +0300 Subject: SL-11431 [Legacy Profiles] Clicking someone else's profile picture should open image modal. --- .../default/xui/en/floater_preview_texture.xml | 208 ++++++++++++--------- .../default/xui/en/panel_profile_secondlife.xml | 1 - 2 files changed, 118 insertions(+), 91 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/floater_preview_texture.xml b/indra/newview/skins/default/xui/en/floater_preview_texture.xml index e1e7e1c8c8..048cf7df62 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_texture.xml @@ -17,94 +17,122 @@ name="Copy"> Copy To Inventory - - Description: - - - - [WIDTH]px x [HEIGHT]px - - - Preview aspect ratio - - - - + + - + Date: Mon, 21 Oct 2019 17:46:26 +0300 Subject: SL-12158 Fixed messy 'Align' button positioning --- indra/newview/skins/default/xui/en/panel_tools_texture.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml index ec610758cc..1819106970 100644 --- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml @@ -806,14 +806,14 @@ top_delta="16" width="260" /> - - @@ -1858,7 +1722,7 @@ Paste Rotation increment="5" initial_value="0" layout="topleft" - left="135" + left="125" max_val="95" name="Scale 1" top_pad="4" @@ -1882,7 +1746,7 @@ Paste Rotation follows="left|top" height="15" layout="topleft" - left="135" + left="125" name="Hollow Shape" top_pad="4" width="150"> @@ -1960,7 +1824,7 @@ Paste Rotation follows="left|top" height="10" layout="topleft" - left="135" + left="125" name="scale_taper" top_pad="3" width="150"> @@ -2013,7 +1877,7 @@ Paste Rotation follows="left|top" height="10" layout="topleft" - left="135" + left="125" name="text topshear" top_pad="3" width="141"> @@ -2056,7 +1920,7 @@ Paste Rotation follows="left|top" height="10" layout="topleft" - left="135" + left="125" name="advanced_cut" top_pad="3" width="150"> @@ -2120,7 +1984,7 @@ Paste Rotation follows="left|top" height="10" layout="topleft" - left="135" + left="125" name="text taper2" top_pad="3" width="150"> @@ -2163,7 +2027,7 @@ Paste Rotation follows="left|top" height="10" layout="topleft" - left="135" + left="125" name="text radius delta" top_pad="2" width="78"> @@ -2188,7 +2052,7 @@ Paste Rotation increment="0.05" initial_value="0" layout="topleft" - left="135" + left="125" min_val="-1" name="Radius Offset" top_pad="4" @@ -2213,7 +2077,7 @@ Paste Rotation height="141" label="Sculpt Texture" layout="topleft" - left="135" + left="125" name="sculpt texture control" tool_tip="Click to choose a picture" top="70" @@ -2671,7 +2535,7 @@ Paste Rotation top_pad="8" width="132" /> - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3 From f363646eb71d58007fc4936a67ad9c7bde9b93ac Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 2 Jun 2020 21:53:28 +0300 Subject: SL-13359 #2 UI changes for panel object todo: new icons, separator and some repositioning --- .../newview/skins/default/xui/en/floater_tools.xml | 64 ++++++++++++++++++---- .../skins/default/xui/en/menu_copy_paste_pos.xml | 21 +++++++ .../skins/default/xui/en/menu_copy_paste_rot.xml | 21 +++++++ .../skins/default/xui/en/menu_copy_paste_size.xml | 21 +++++++ 4 files changed, 116 insertions(+), 11 deletions(-) create mode 100644 indra/newview/skins/default/xui/en/menu_copy_paste_pos.xml create mode 100644 indra/newview/skins/default/xui/en/menu_copy_paste_rot.xml create mode 100644 indra/newview/skins/default/xui/en/menu_copy_paste_size.xml (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 0abee2ff80..2397be6b61 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -1430,6 +1430,18 @@ even though the user gets a free copy. tool_tip="Causes object to not collide with other objects or avatars" top_pad="0" width="123" /> + - Position (meters) + Position + - Size (meters) + Size + - Rotation (degrees) + Rotation + + + + + + + + + + diff --git a/indra/newview/skins/default/xui/en/menu_copy_paste_rot.xml b/indra/newview/skins/default/xui/en/menu_copy_paste_rot.xml new file mode 100644 index 0000000000..dcfb3faeca --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_copy_paste_rot.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + diff --git a/indra/newview/skins/default/xui/en/menu_copy_paste_size.xml b/indra/newview/skins/default/xui/en/menu_copy_paste_size.xml new file mode 100644 index 0000000000..58d71b12d5 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_copy_paste_size.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + -- cgit v1.2.3 From 30f1038351734b946be9a6f910e4e0eca82be1d4 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 3 Jun 2020 16:12:11 +0300 Subject: SL-13359 #3 UI changes for panel object --- .../newview/skins/default/xui/en/floater_tools.xml | 48 +++++++++++++--------- 1 file changed, 29 insertions(+), 19 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 2397be6b61..7768f894b8 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -1430,19 +1430,29 @@ even though the user gets a free copy. tool_tip="Causes object to not collide with other objects or avatars" top_pad="0" width="123" /> + - Date: Wed, 3 Jun 2020 19:37:53 +0300 Subject: SL-13359 #4 Adjusted some elements --- indra/newview/skins/default/xui/en/floater_tools.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 7768f894b8..afc6155585 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -1460,10 +1460,10 @@ even though the user gets a free copy. layout="topleft" name="label position" tool_tip="Position (meters)" - left_pad="3" + left_pad="8" top_delta="0" width="121"> - Position + Position (m) - Size + Size (m) - Rotation + Rotation (°) Date: Wed, 17 Jun 2020 23:38:55 +0300 Subject: SL-13359 #5 Implemented revised changes --- .../newview/skins/default/xui/en/floater_tools.xml | 31 +++++++++++++++++++--- .../default/xui/en/menu_copy_paste_generic.xml | 21 +++++++++++++++ .../skins/default/xui/en/menu_copy_paste_pos.xml | 26 ++++++++++++++---- .../skins/default/xui/en/menu_copy_paste_rot.xml | 26 ++++++++++++++---- .../skins/default/xui/en/menu_copy_paste_size.xml | 26 ++++++++++++++---- 5 files changed, 111 insertions(+), 19 deletions(-) create mode 100644 indra/newview/skins/default/xui/en/menu_copy_paste_generic.xml (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index afc6155585..0b2b1abeb9 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -1436,7 +1436,7 @@ even though the user gets a free copy. height="0" layout="topleft" left_delta="0" - name="lod_tab_border" + name="object_horizontal" top_pad="10" width="95" /> Prim Type --> + + + width="125"> + Path Cut (begin/end) diff --git a/indra/newview/skins/default/xui/en/menu_copy_paste_generic.xml b/indra/newview/skins/default/xui/en/menu_copy_paste_generic.xml new file mode 100644 index 0000000000..8e016e4a1c --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_copy_paste_generic.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + diff --git a/indra/newview/skins/default/xui/en/menu_copy_paste_pos.xml b/indra/newview/skins/default/xui/en/menu_copy_paste_pos.xml index c2763af603..3ea95b281f 100644 --- a/indra/newview/skins/default/xui/en/menu_copy_paste_pos.xml +++ b/indra/newview/skins/default/xui/en/menu_copy_paste_pos.xml @@ -3,19 +3,35 @@ layout="topleft" name="Copy Paste Position Menu"> + + + + - + + + + + - - + + diff --git a/indra/newview/skins/default/xui/en/menu_copy_paste_rot.xml b/indra/newview/skins/default/xui/en/menu_copy_paste_rot.xml index dcfb3faeca..06ce80f897 100644 --- a/indra/newview/skins/default/xui/en/menu_copy_paste_rot.xml +++ b/indra/newview/skins/default/xui/en/menu_copy_paste_rot.xml @@ -3,19 +3,35 @@ layout="topleft" name="Copy Paste Rotation Menu"> + + + + - + + + + + - - + + diff --git a/indra/newview/skins/default/xui/en/menu_copy_paste_size.xml b/indra/newview/skins/default/xui/en/menu_copy_paste_size.xml index 58d71b12d5..7082a0e65b 100644 --- a/indra/newview/skins/default/xui/en/menu_copy_paste_size.xml +++ b/indra/newview/skins/default/xui/en/menu_copy_paste_size.xml @@ -3,19 +3,35 @@ layout="topleft" name="Copy Paste Size Menu"> + + + + - + + + + + - - + + -- cgit v1.2.3 From ef8d42a05ecd611c2bd16492c6727813bdcfd6bb Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Thu, 18 Jun 2020 00:13:38 +0300 Subject: SL-13359 #6 Fixed padding --- .../newview/skins/default/xui/en/floater_tools.xml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 0b2b1abeb9..d93ce2af1c 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -1737,7 +1737,7 @@ even though the user gets a free copy. layout="topleft" left="125" name="text cut" - top_pad="7" + top_pad="5" width="150"> Path Cut (begin/end) @@ -1775,7 +1775,7 @@ even though the user gets a free copy. layout="topleft" left="125" name="text hollow" - top_pad="6" + top_pad="7" width="68"> Hollow @@ -1823,7 +1823,7 @@ even though the user gets a free copy. layout="topleft" left="125" name="Hollow Shape" - top_pad="4" + top_pad="7" width="150"> Hollow Shape @@ -1859,7 +1859,7 @@ even though the user gets a free copy. layout="topleft" left_delta="0" name="text twist" - top_pad="5" + top_pad="7" width="150"> Twist (begin/end) @@ -1901,12 +1901,12 @@ even though the user gets a free copy. layout="topleft" left="125" name="scale_taper" - top_pad="3" + top_pad="7" width="150"> Taper Top Shear @@ -1997,12 +1997,12 @@ even though the user gets a free copy. layout="topleft" left="125" name="advanced_cut" - top_pad="3" + top_pad="7" width="150"> Profile Cut (begin/end) Taper @@ -2104,7 +2104,7 @@ even though the user gets a free copy. layout="topleft" left="125" name="text radius delta" - top_pad="2" + top_pad="7" width="78"> Radius -- cgit v1.2.3 From d95f86c5931db5b025e0923071c9b3a08bb25301 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Thu, 18 Jun 2020 22:38:58 +0300 Subject: SL-13359 #7 Features tab --- .../newview/skins/default/xui/en/floater_tools.xml | 43 ++++++++++++++++++++-- .../default/xui/en/menu_copy_paste_features.xml | 21 +++++++++++ .../default/xui/en/menu_copy_paste_generic.xml | 21 ----------- .../skins/default/xui/en/menu_copy_paste_light.xml | 21 +++++++++++ .../default/xui/en/menu_copy_paste_object.xml | 21 +++++++++++ 5 files changed, 102 insertions(+), 25 deletions(-) create mode 100644 indra/newview/skins/default/xui/en/menu_copy_paste_features.xml delete mode 100644 indra/newview/skins/default/xui/en/menu_copy_paste_generic.xml create mode 100644 indra/newview/skins/default/xui/en/menu_copy_paste_light.xml create mode 100644 indra/newview/skins/default/xui/en/menu_copy_paste_object.xml (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index d93ce2af1c..6e08be4866 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -1717,7 +1717,7 @@ even though the user gets a free copy. value="Sculpted" /> None Prim Convex Hull + + + + + + + + + + + + + diff --git a/indra/newview/skins/default/xui/en/menu_copy_paste_generic.xml b/indra/newview/skins/default/xui/en/menu_copy_paste_generic.xml deleted file mode 100644 index 8e016e4a1c..0000000000 --- a/indra/newview/skins/default/xui/en/menu_copy_paste_generic.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - diff --git a/indra/newview/skins/default/xui/en/menu_copy_paste_light.xml b/indra/newview/skins/default/xui/en/menu_copy_paste_light.xml new file mode 100644 index 0000000000..941efe7d01 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_copy_paste_light.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + diff --git a/indra/newview/skins/default/xui/en/menu_copy_paste_object.xml b/indra/newview/skins/default/xui/en/menu_copy_paste_object.xml new file mode 100644 index 0000000000..8e016e4a1c --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_copy_paste_object.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + -- cgit v1.2.3 From 15f02e2da231827a7cac18a2444c212efc8c1d1c Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 19 Jun 2020 17:34:57 +0300 Subject: SL-13359 #8 Reverted changes to texture tab This reverts commit 1e1707d532560583744bb877adfed11864f2db31. --- .../skins/default/xui/en/menu_texture_paste.xml | 70 ---------------------- .../skins/default/xui/en/panel_tools_texture.xml | 55 ++++------------- 2 files changed, 10 insertions(+), 115 deletions(-) delete mode 100644 indra/newview/skins/default/xui/en/menu_texture_paste.xml (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/menu_texture_paste.xml b/indra/newview/skins/default/xui/en/menu_texture_paste.xml deleted file mode 100644 index be6535b989..0000000000 --- a/indra/newview/skins/default/xui/en/menu_texture_paste.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml index 1819106970..438fb1e8ed 100644 --- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml @@ -43,7 +43,7 @@ follows="left|top" height="10" layout="topleft" - left_pad="10" + left_pad="15" name="color trans" text_readonly_color="LabelDisabledColor" top="6" @@ -68,7 +68,7 @@ follows="left|top" height="10" layout="topleft" - left_pad="13" + left_pad="15" name="glow label" text_readonly_color="LabelDisabledColor" top="6" @@ -84,7 +84,7 @@ left_delta="0" name="glow" top_pad="4" - width="50" /> + width="80" /> - - - - + Date: Fri, 19 Jun 2020 22:18:31 +0300 Subject: SL-13359 #9 Texture tab --- .../newview/skins/default/xui/en/floater_tools.xml | 6 +-- .../skins/default/xui/en/menu_copy_paste_color.xml | 21 +++++++++ .../default/xui/en/menu_copy_paste_features.xml | 2 +- .../skins/default/xui/en/menu_copy_paste_light.xml | 2 +- .../default/xui/en/menu_copy_paste_object.xml | 2 +- .../default/xui/en/menu_copy_paste_texture.xml | 21 +++++++++ .../skins/default/xui/en/panel_tools_texture.xml | 51 ++++++++++++++++++---- 7 files changed, 91 insertions(+), 14 deletions(-) create mode 100644 indra/newview/skins/default/xui/en/menu_copy_paste_color.xml create mode 100644 indra/newview/skins/default/xui/en/menu_copy_paste_texture.xml (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 6e08be4866..1bbc2302c3 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -2,7 +2,7 @@ + + + + + + + + + + diff --git a/indra/newview/skins/default/xui/en/menu_copy_paste_features.xml b/indra/newview/skins/default/xui/en/menu_copy_paste_features.xml index dd58658472..4823d74a26 100644 --- a/indra/newview/skins/default/xui/en/menu_copy_paste_features.xml +++ b/indra/newview/skins/default/xui/en/menu_copy_paste_features.xml @@ -1,7 +1,7 @@ + name="Copy Paste Features Menu"> + name="Copy Paste Light Menu"> + name="Copy Paste Object Menu"> + + + + + + + + + + diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml index 438fb1e8ed..611433bc1d 100644 --- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml @@ -11,6 +11,19 @@ name="Texture" top="0" width="295"> + + width="54" /> + width="77" /> + + top_pad="17" + width="90"> - + + Date: Mon, 22 Jun 2020 19:35:56 +0300 Subject: SL-13359 #10 Indicate face selection in tools floater --- indra/newview/skins/default/xui/en/floater_tools.xml | 10 +++++----- indra/newview/skins/default/xui/en/menu_copy_paste_texture.xml | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 1bbc2302c3..f5214420b4 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -68,7 +68,7 @@ - [OBJ_COUNT] objects selected, land impact [LAND_IMPACT] + [OBJ_COUNT] objects selected, land impact [LAND_IMPACT] [secondlife:///app/openfloater/object_weights More info] @@ -763,11 +763,12 @@ font="SansSerifSmall" layout="topleft" left="10" - name="selection_count" + name="selection_faces" top_delta="0" visible="false" width="280"> - + Faces selected: [FACES_STRING] + - [CAPACITY_STRING] [secondlife:///app/openfloater/object_weights More info] diff --git a/indra/newview/skins/default/xui/en/menu_copy_paste_texture.xml b/indra/newview/skins/default/xui/en/menu_copy_paste_texture.xml index 8267041502..f358affc23 100644 --- a/indra/newview/skins/default/xui/en/menu_copy_paste_texture.xml +++ b/indra/newview/skins/default/xui/en/menu_copy_paste_texture.xml @@ -7,15 +7,15 @@ layout="topleft" name="params_copy" visible="true"> - + - - + + -- cgit v1.2.3 From 23f20c207d1e69c03e2ce2cb9100ad216ac60708 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 23 Jun 2020 22:02:33 +0300 Subject: SL-12688 Warnings part #1 --- indra/newview/skins/default/xui/en/notifications.xml | 10 ++++++++++ indra/newview/skins/default/xui/en/panel_tools_texture.xml | 9 +++++++++ 2 files changed, 19 insertions(+) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 8a91a1f721..f59ac450f2 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -8946,6 +8946,16 @@ We cannot display a preview of this texture because it is no-copy and/or no-tran name="okignore" yestext="OK"/> + + +Paste failed. [REASON] + + + + When multiple faces are copied, the target object must have the same number of faces selected. + + + When all faces of an object are copied, the target object must have the same number of faces. + + Date: Wed, 24 Jun 2020 18:57:49 +0300 Subject: SL-12688 Warnings part #2 --- indra/newview/skins/default/xui/en/notifications.xml | 15 ++++++++++++++- .../newview/skins/default/xui/en/panel_tools_texture.xml | 4 ++++ 2 files changed, 18 insertions(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index f59ac450f2..196d507507 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -8946,7 +8946,7 @@ We cannot display a preview of this texture because it is no-copy and/or no-tran name="okignore" yestext="OK"/> - + + + You applied a texture with limited permissions, object will inherit permissions from texture. + + + + When all faces of an object are copied, the target object must have the same number of faces. + + One or more texture not found in inventory. + Date: Sat, 11 Jul 2020 04:35:34 +0300 Subject: SL-13556 The browser status label shouldn't be clickable --- indra/newview/skins/default/xui/en/panel_profile_web.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/panel_profile_web.xml b/indra/newview/skins/default/xui/en/panel_profile_web.xml index af2ac57f58..e0cb4d3d06 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_web.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_web.xml @@ -31,5 +31,6 @@ follows="bottom|left|right" layout="topleft" halign="center" + parse_urls="false" /> -- cgit v1.2.3 From 2d113743f2943a1ab614a41d29cef7e13bc4e878 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Thu, 14 Jan 2021 18:02:09 +0200 Subject: SL-14504 FIXED Classified links always launch your Profile Classifieds --- .../newview/skins/default/xui/en/floater_picks.xml | 21 ++++++++++++ .../skins/default/xui/en/panel_classified_info.xml | 37 ++-------------------- 2 files changed, 24 insertions(+), 34 deletions(-) create mode 100644 indra/newview/skins/default/xui/en/floater_picks.xml (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/floater_picks.xml b/indra/newview/skins/default/xui/en/floater_picks.xml new file mode 100644 index 0000000000..3cd6abafe5 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_picks.xml @@ -0,0 +1,21 @@ + + + + diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml index d4a2745d1d..04a0bc800d 100644 --- a/indra/newview/skins/default/xui/en/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml @@ -38,28 +38,15 @@ name="auto_renew_off"> Disabled - + width="85"/> + width="85"/>