From 3ee20531c96c05452a4b832634df000cf5d0dc08 Mon Sep 17 00:00:00 2001
From: Kadah_Coba <kadah.coba@gmail.com>
Date: Mon, 8 Apr 2019 03:05:03 -0700
Subject: Added Copy/Paste to object properties in Build Tools

---
 .../newview/skins/default/textures/icons/Paste.png | Bin 0 -> 530 bytes
 indra/newview/skins/default/textures/textures.xml  |   1 +
 .../newview/skins/default/xui/en/floater_tools.xml | 126 ++++++++++++++++++---
 3 files changed, 109 insertions(+), 18 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/Paste.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/Paste.png b/indra/newview/skins/default/textures/icons/Paste.png
new file mode 100644
index 0000000000..10211df427
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Paste.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 2540ee148d..c3cc4e83d0 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -187,6 +187,7 @@ with the same filename but different name
   <texture name="Conv_log_inbox" file_name="icons/Conv_log_inbox.png" preload="false" />
 
   <texture name="Copy" file_name="icons/Copy.png" preload="false" />
+  <texture name="Paste" file_name="icons/Paste.png" preload="false" />
   
   <texture name="DisclosureArrow_Opened_Off" file_name="widgets/DisclosureArrow_Opened_Off.png" preload="true" />
 
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index d9a15fed9e..81a207c023 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -1446,6 +1446,21 @@ even though the user gets a free copy.
              text_enabled_color="1 0 0.3 .7"
              top_pad="5"
              width="87" />
+            <button
+             top_delta="0"
+             left_pad="5"
+             height="19"
+             width="20"
+             follows="top|right"
+             layout="topleft"
+             tab_stop="false"
+             image_bottom_pad="1"
+             image_overlay="Copy"
+             image_hover_unselected="Toolbar_Middle_Over"
+             image_selected="Toolbar_Middle_Selected"
+             image_unselected="Toolbar_Middle_Off"
+             name="copy_pos_btn"
+             tool_tip="Copy Position" />
             <spinner
              follows="left|top"
              height="19"
@@ -1454,13 +1469,28 @@ even though the user gets a free copy.
              label="Y"
              label_width="10"
              layout="topleft"
-             left_delta="0"
+             left="10"
              max_val="512"
              min_val="-256"
              name="Pos Y"
              text_enabled_color="EmphasisColor"
              top_pad="3"
              width="87" />
+            <button
+             top_delta="0"
+             left_pad="5"
+             height="19"
+             width="20"
+             follows="top|right"
+             layout="topleft"
+             tab_stop="false"
+             image_bottom_pad="1"
+             image_overlay="Paste"
+             image_hover_unselected="Toolbar_Middle_Over"
+             image_selected="Toolbar_Middle_Selected"
+             image_unselected="Toolbar_Middle_Off"
+             name="paste_pos_btn"
+             tool_tip="Paste Position" />
             <spinner
              follows="left|top"
              height="19"
@@ -1469,7 +1499,7 @@ even though the user gets a free copy.
              label="Z"
              label_width="10"
              layout="topleft"
-             left_delta="0"
+             left="10"
              max_val="4096"
              name="Pos Z"
              text_enabled_color="0 0.8 1 .65"
@@ -1502,6 +1532,21 @@ even though the user gets a free copy.
              text_enabled_color="1 1 1 1"
              top_pad="5"
              width="87" />
+            <button
+             top_delta="0"
+             left_pad="5"
+             height="19"
+             width="20"
+             follows="top|right"
+             layout="topleft"
+             tab_stop="false"
+             image_bottom_pad="1"
+             image_overlay="Copy"
+             image_hover_unselected="Toolbar_Middle_Over"
+             image_selected="Toolbar_Middle_Selected"
+             image_unselected="Toolbar_Middle_Off"
+             name="copy_size_btn"
+             tool_tip="Copy Size" />
             <spinner
              follows="left|top"
              height="19"
@@ -1510,13 +1555,28 @@ even though the user gets a free copy.
              label="Y"
              label_width="10"
              layout="topleft"
-             left_delta="0"
+             left="10"
              max_val="64"
              min_val="0.01"
              name="Scale Y"
              text_enabled_color="1 1 1 1"
              top_pad="3"
              width="87" />
+            <button
+             top_delta="0"
+             left_pad="5"
+             height="19"
+             width="20"
+             follows="top|right"
+             layout="topleft"
+             tab_stop="false"
+             image_bottom_pad="1"
+             image_overlay="Paste"
+             image_hover_unselected="Toolbar_Middle_Over"
+             image_selected="Toolbar_Middle_Selected"
+             image_unselected="Toolbar_Middle_Off"
+             name="paste_size_btn"
+             tool_tip="Paste Size" />
             <spinner
              follows="left|top"
              height="19"
@@ -1525,7 +1585,7 @@ even though the user gets a free copy.
              label="Z"
              label_width="10"
              layout="topleft"
-             left_delta="0"
+             left="10"
              max_val="64"
              min_val="0.01"
              name="Scale Z"
@@ -1560,6 +1620,21 @@ even though the user gets a free copy.
              text_enabled_color="1 1 1 1"
              top_pad="5"
              width="87" />
+            <button
+             top_delta="0"
+             left_pad="5"
+             height="19"
+             width="20"
+             follows="top|right"
+             layout="topleft"
+             tab_stop="false"
+             image_bottom_pad="1"
+             image_overlay="Copy"
+             image_hover_unselected="Toolbar_Middle_Over"
+             image_selected="Toolbar_Middle_Selected"
+             image_unselected="Toolbar_Middle_Off"
+             name="copy_rot_btn"
+             tool_tip="Copy Rotation" />
             <spinner
              decimal_digits="2"
              follows="left|top"
@@ -1569,13 +1644,28 @@ even though the user gets a free copy.
              label="Y"
              label_width="10"
              layout="topleft"
-             left_delta="0"
+             left="10"
              max_val="9999"
              min_val="-9999"
              name="Rot Y"
              text_enabled_color="1 1 1 1"
              top_pad="3"
              width="87" />
+            <button
+             top_delta="0"
+             left_pad="5"
+             height="19"
+             width="20"
+             follows="top|right"
+             layout="topleft"
+             tab_stop="false"
+             image_bottom_pad="1"
+             image_overlay="Paste"
+             image_hover_unselected="Toolbar_Middle_Over"
+             image_selected="Toolbar_Middle_Selected"
+             image_unselected="Toolbar_Middle_Off"
+             name="paste_rot_btn"
+             tool_tip="Paste Rotation" />
             <spinner
              decimal_digits="2"
              follows="left|top"
@@ -1585,7 +1675,7 @@ even though the user gets a free copy.
              label="Z"
              label_width="10"
              layout="topleft"
-             left_delta="0"
+             left="10"
              max_val="9999"
              min_val="-9999"
              name="Rot Z"
@@ -1598,7 +1688,7 @@ even though the user gets a free copy.
              follows="left|top"
              height="10"
              layout="topleft"
-             left="125"
+             left="135"
              name="label basetype"
              top="5"
              width="150">
@@ -1609,7 +1699,7 @@ even though the user gets a free copy.
              layout="topleft"
              name="comboBaseType"
              top="6"
-             left="125"
+             left="135"
              width="150">
                 <combo_box.item
                  label="Box"
@@ -1688,7 +1778,7 @@ even though the user gets a free copy.
              follows="left|top"
              height="10"
              layout="topleft"
-             left="125"
+             left="135"
              name="text hollow"
              top_pad="6"
              width="68">
@@ -1712,7 +1802,7 @@ even though the user gets a free copy.
              increment="5"
              initial_value="0"
              layout="topleft"
-             left="125"
+             left="135"
              max_val="95"
              name="Scale 1"
              top_pad="4"
@@ -1736,7 +1826,7 @@ even though the user gets a free copy.
              follows="left|top"
              height="15"
              layout="topleft"
-             left="125"
+             left="135"
              name="Hollow Shape"
              top_pad="4"
              width="150">
@@ -1814,7 +1904,7 @@ even though the user gets a free copy.
              follows="left|top"
              height="10"
              layout="topleft"
-             left="125"
+             left="135"
              name="scale_taper"
              top_pad="3"
              width="150">
@@ -1867,7 +1957,7 @@ even though the user gets a free copy.
              follows="left|top"
              height="10"
              layout="topleft"
-             left="125"
+             left="135"
              name="text topshear"
              top_pad="3"
              width="141">
@@ -1910,7 +2000,7 @@ even though the user gets a free copy.
              follows="left|top"
              height="10"
              layout="topleft"
-             left="125"
+             left="135"
              name="advanced_cut"
              top_pad="3"
              width="150">
@@ -1974,7 +2064,7 @@ even though the user gets a free copy.
              follows="left|top"
              height="10"
              layout="topleft"
-             left="125"
+             left="135"
              name="text taper2"
              top_pad="3"
              width="150">
@@ -2017,7 +2107,7 @@ even though the user gets a free copy.
              follows="left|top"
              height="10"
              layout="topleft"
-             left="125"
+             left="135"
              name="text radius delta"
              top_pad="2"
              width="78">
@@ -2042,7 +2132,7 @@ even though the user gets a free copy.
              increment="0.05"
              initial_value="0"
              layout="topleft"
-             left="125"
+             left="135"
              min_val="-1"
              name="Radius Offset"
              top_pad="4"
@@ -2067,7 +2157,7 @@ even though the user gets a free copy.
              height="141"
              label="Sculpt Texture"
              layout="topleft"
-             left="125"
+             left="135"
              name="sculpt texture control"
              tool_tip="Click to choose a picture"
              top="70"
-- 
cgit v1.2.3


From 3a27acca73ec340987a1379c92eba5a45cc236a6 Mon Sep 17 00:00:00 2001
From: Kadah_Coba <kadah.coba@gmail.com>
Date: Tue, 9 Apr 2019 00:12:04 -0700
Subject: Added Copy/Paste object parameters in Build Tools

---
 .../newview/skins/default/xui/en/floater_tools.xml | 23 +++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 81a207c023..1e2846d943 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -1694,11 +1694,32 @@ even though the user gets a free copy.
              width="150">
                 Prim Type
             </text>-->
+    		<button
+    		 follows="top|right"
+    		 height="16"
+    		 label="Copy"
+    		 layout="topleft"
+    		 left="135"
+    		 name="copy_params_btn"
+    		 tool_tip="Copy Parameters to Clipboard"
+             top="6"
+    		 width="65">
+    		</button>
+    		<button
+    		 follows="top|right"
+    		 height="16"
+    		 label="Paste"
+    		 layout="topleft"
+    		 left_pad="10"
+    		 name="paste_params_btn"
+    		 tool_tip="Paste Parameters from Clipboard"
+    		 width="65">
+    		</button>
             <combo_box
              height="19"
              layout="topleft"
              name="comboBaseType"
-             top="6"
+             top_pad="5"
              left="135"
              width="150">
                 <combo_box.item
-- 
cgit v1.2.3


From 41f5801aae25931b8e1a2db1b2eb9623efbc1f3e Mon Sep 17 00:00:00 2001
From: Kadah_Coba <kadah.coba@gmail.com>
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')

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.
             </text>-->
     		<button
     		 follows="top|right"
-    		 height="16"
+    		 height="23"
     		 label="Copy"
     		 layout="topleft"
     		 left="135"
     		 name="copy_params_btn"
     		 tool_tip="Copy Parameters to Clipboard"
              top="6"
-    		 width="65">
+    		 width="53">
     		</button>
     		<button
     		 follows="top|right"
-    		 height="16"
+    		 height="23"
     		 label="Paste"
     		 layout="topleft"
-    		 left_pad="10"
+    		 left_pad="5"
     		 name="paste_params_btn"
     		 tool_tip="Paste Parameters from Clipboard"
-    		 width="65">
+    		 width="53">
     		</button>
+            <menu_button
+             menu_filename="menu_build_paste.xml"
+             follows="top|left"
+             height="23"
+             image_hover_unselected="Toolbar_Middle_Over"
+             image_overlay="OptionsMenu_Off"
+             image_selected="Toolbar_Middle_Selected"
+             image_unselected="Toolbar_Middle_Off"
+             layout="topleft"
+             left_pad="5"
+             name="patse_gear_btn"
+             tool_tip="Paste options"
+             width="31"/>
             <combo_box
              height="19"
              layout="topleft"
-- 
cgit v1.2.3


From 43bf63efd0b0a1e8705ce25115eac00c3a34230b Mon Sep 17 00:00:00 2001
From: Kadah_Coba <kadah.coba@gmail.com>
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')

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">
+            <panel.string name="paste_position">
+Paste Position
+[VALUE]
+            </panel.string>
+            <panel.string name="paste_size">
+Paste Size
+[VALUE]
+            </panel.string>
+            <panel.string name="paste_rotation">
+Paste Rotation
+[VALUE]
+            </panel.string>
             <check_box
              height="19"
              label="Locked"
-- 
cgit v1.2.3


From 0df2e4ed98caecd2158ee7d1c42dce3dffa9ec20 Mon Sep 17 00:00:00 2001
From: Kadah_Coba <kadah.coba@gmail.com>
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')

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 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ layout="topleft"
+ name="Conversation Gear Menu">
+    <menu_item_check
+     label="Prim Parameters"
+     layout="topleft"
+     name="Parametric">
+        <on_check function="BuildObject.PasteCheckItem" parameter="Parametric" />
+        <on_click function="BuildObject.PasteDoToSelected" parameter="Parametric" />
+        <on_enable function="BuildObject.PasteEnable" parameter="Parametric" />
+    </menu_item_check>
+    <menu_item_check
+     label="Physics"
+     layout="topleft"
+     name="Physics">
+        <on_check function="BuildObject.PasteCheckItem" parameter="Physics" />
+        <on_click function="BuildObject.PasteDoToSelected" parameter="Physics" />
+        <on_enable function="BuildObject.PasteEnable" parameter="Physics" />
+    </menu_item_check>
+    <menu_item_check
+     label="Light"
+     layout="topleft"
+     name="Light">
+        <on_check function="BuildObject.PasteCheckItem" parameter="Light" />
+        <on_click function="BuildObject.PasteDoToSelected" parameter="Light" />
+        <on_enable function="BuildObject.PasteEnable" parameter="Light" />
+    </menu_item_check>
+</toggleable_menu>
+
-- 
cgit v1.2.3


From 733f799c4359d32778b5f345ae434152467334bc Mon Sep 17 00:00:00 2001
From: Kadah_Coba <kadah.coba@gmail.com>
Date: Fri, 6 Sep 2019 20:46:23 -0700
Subject: Cleanup object copy/paste functions

---
 indra/newview/skins/default/xui/en/floater_tools.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 150d3d9804..3032ad50b3 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 @@ Paste Rotation
              image_unselected="Toolbar_Middle_Off"
              layout="topleft"
              left_pad="5"
-             name="patse_gear_btn"
+             name="paste_gear_btn"
              tool_tip="Paste options"
              width="31"/>
             <combo_box
@@ -2661,7 +2661,7 @@ Paste Rotation
              top_pad="8"
              width="132" />
         </panel>
-         <panel
+        <panel
          label="Texture"
          help_topic="toolbox_texture_tab"
          name="Texture"
-- 
cgit v1.2.3


From 1e1707d532560583744bb877adfed11864f2db31 Mon Sep 17 00:00:00 2001
From: Kadah_Coba <kadah.coba@gmail.com>
Date: Mon, 14 Oct 2019 20:35:44 -0700
Subject: [Project Copy/Paste] Texture support

---
 .../skins/default/xui/en/menu_texture_paste.xml    | 70 ++++++++++++++++++++++
 .../skins/default/xui/en/panel_tools_texture.xml   | 55 +++++++++++++----
 2 files changed, 115 insertions(+), 10 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/menu_texture_paste.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_texture_paste.xml b/indra/newview/skins/default/xui/en/menu_texture_paste.xml
new file mode 100644
index 0000000000..be6535b989
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_texture_paste.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ layout="topleft"
+ name="Conversation Gear Menu">
+    <menu_item_check
+     label="Color"
+     layout="topleft"
+     name="Color">
+        <on_check function="BuildFace.PasteCheckItem" parameter="Color" />
+        <on_click function="BuildFace.PasteDoToSelected" parameter="Color" />
+        <on_enable function="BuildFace.PasteEnable" parameter="Color" />
+    </menu_item_check>
+    <menu_item_check
+     label="Transparency"
+     layout="topleft"
+     name="Transparency">
+        <on_check function="BuildFace.PasteCheckItem" parameter="Transparency" />
+        <on_click function="BuildFace.PasteDoToSelected" parameter="Transparency" />
+        <on_enable function="BuildFace.PasteEnable" parameter="Transparency" />
+    </menu_item_check>
+    <menu_item_check
+     label="Glow"
+     layout="topleft"
+     name="Glow">
+        <on_check function="BuildFace.PasteCheckItem" parameter="Glow" />
+        <on_click function="BuildFace.PasteDoToSelected" parameter="Glow" />
+        <on_enable function="BuildFace.PasteEnable" parameter="Glow" />
+    </menu_item_check>
+    <menu_item_check
+     label="Texture"
+     layout="topleft"
+     name="Diffuse">
+        <on_check function="BuildFace.PasteCheckItem" parameter="Diffuse" />
+        <on_click function="BuildFace.PasteDoToSelected" parameter="Diffuse" />
+        <on_enable function="BuildFace.PasteEnable" parameter="Diffuse" />
+    </menu_item_check>
+    <menu_item_check
+     label="Bumpiness"
+     layout="topleft"
+     name="Normal">
+        <on_check function="BuildFace.PasteCheckItem" parameter="Normal" />
+        <on_click function="BuildFace.PasteDoToSelected" parameter="Normal" />
+        <on_enable function="BuildFace.PasteEnable" parameter="Normal" />
+    </menu_item_check>
+    <menu_item_check
+     label="Shininess"
+     layout="topleft"
+     name="Specular">
+        <on_check function="BuildFace.PasteCheckItem" parameter="Specular" />
+        <on_click function="BuildFace.PasteDoToSelected" parameter="Specular" />
+        <on_enable function="BuildFace.PasteEnable" parameter="Specular" />
+    </menu_item_check>
+    <menu_item_check
+     label="Mapping"
+     layout="topleft"
+     name="Mapping">
+        <on_check function="BuildFace.PasteCheckItem" parameter="Mapping" />
+        <on_click function="BuildFace.PasteDoToSelected" parameter="Mapping" />
+        <on_enable function="BuildFace.PasteEnable" parameter="Mapping" />
+    </menu_item_check>
+    <menu_item_check
+     label="Media"
+     layout="topleft"
+     name="Media">
+        <on_check function="BuildFace.PasteCheckItem" parameter="Media" />
+        <on_click function="BuildFace.PasteDoToSelected" parameter="Media" />
+        <on_enable function="BuildFace.PasteEnable" parameter="Media" />
+    </menu_item_check>
+</toggleable_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 67b99ca588..a658676b51 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="15"
+             left_pad="10"
              name="color trans"
              text_readonly_color="LabelDisabledColor"
              top="6"
@@ -68,7 +68,7 @@
              follows="left|top"
              height="10"
              layout="topleft"
-             left_pad="15"
+             left_pad="13"
              name="glow label"
              text_readonly_color="LabelDisabledColor"
              top="6"
@@ -84,7 +84,7 @@
              left_delta="0"
              name="glow"
              top_pad="4"
-             width="80" />
+             width="50" />
             <check_box
              height="19"
              label="Full Bright"
@@ -93,12 +93,47 @@
              name="checkbox fullbright"
              top_pad="4"
              width="81" />
+            <button
+             follows="top|right"
+             height="23"
+             label="Copy"
+             layout="topleft"
+             left="240"
+             name="copy_face_btn"
+             tool_tip="Copy Parameters to Clipboard"
+             top="6"
+             width="53">
+            </button>
+            <button
+             follows="top|right"
+             height="23"
+             label="Paste"
+             layout="topleft"
+             name="paste_face_btn"
+             tool_tip="Paste Parameters from Clipboard"
+             top_pad="5"
+             width="53">
+            </button>
+            <menu_button
+             menu_filename="menu_texture_paste.xml"
+             follows="top|left"
+             height="23"
+             image_hover_unselected="Toolbar_Middle_Over"
+             image_overlay="OptionsMenu_Off"
+             image_selected="Toolbar_Middle_Selected"
+             image_unselected="Toolbar_Middle_Off"
+             layout="topleft"
+             left_delta="20"
+             name="paste_face_gear_btn"
+             tool_tip="Paste options"
+             top_pad="5"
+             width="31"/>
             <combo_box
              height="23"
              layout="topleft"
              left="10"
              name="combobox matmedia"
-             top_pad="5"
+             top="70"
              width="100">
                 <combo_box.item
                  label="Materials"
@@ -113,10 +148,10 @@
             control_name="ComboMaterialType"
             height="50"
             layout="topleft"
-            left_pad="20"
+            left_pad="5"
             top_delta="-10"
             width="150"
-            visible = "false"
+            visible = "true"
             name="radio_material_type">
                 <radio_item
                 label="Texture (diffuse)"
@@ -139,7 +174,7 @@
                 layout="topleft"
                 top_pad="1"
                 value="2"/>
-            </radio_group> 
+            </radio_group>
             <check_box
              control_name="SyncMaterialSettings"
              follows="top|left"
@@ -158,7 +193,7 @@
              fallback_image="materials_ui_x_24.png"
              follows="left|top"
              height="80"
-             label="Texture       "
+             label="Texture"
              layout="topleft"
              left="10"
              name="texture control"
@@ -235,7 +270,7 @@
              fallback_image="materials_ui_x_24.png"
              follows="left|top"
              height="80"
-             label="Texture       "
+             label="Texture"
              layout="topleft"
              left="10"
              name="bumpytexture control"
@@ -349,7 +384,7 @@
              fallback_image="materials_ui_x_24.png"
              follows="left|top"
              height="80"
-             label="Texture       "
+             label="Texture"
              layout="topleft"
              left="10"
              name="shinytexture control"
-- 
cgit v1.2.3


From 5310f215323aee7caec188ccc9d871e920385113 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
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')

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" />
 			<button
-			 left="10"
-			 top="222"
+       follows="left|top"
+       layout="topleft"
+			 left="9"
+			 top="192"
 			 height="20"
 			 label="Align"
 			 label_selected="Align current texture layers"
-			 layout="topleft"
 			 name="button align textures"
-			 top_delta="0"
 			 tool_tip="Align current texture layers"
 			 width="66" />
             <web_browser
-- 
cgit v1.2.3


From aec6caf5eb89d8cc5ce37a8d59d2a57a3e745320 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 8 Nov 2019 21:11:48 +0200
Subject: SL-12241 Separated 'flexible' paramenters

---
 indra/newview/skins/default/xui/en/menu_build_paste.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_build_paste.xml b/indra/newview/skins/default/xui/en/menu_build_paste.xml
index f63362dabf..acbef528b8 100644
--- a/indra/newview/skins/default/xui/en/menu_build_paste.xml
+++ b/indra/newview/skins/default/xui/en/menu_build_paste.xml
@@ -10,6 +10,14 @@
         <on_click function="BuildObject.PasteDoToSelected" parameter="Parametric" />
         <on_enable function="BuildObject.PasteEnable" parameter="Parametric" />
     </menu_item_check>
+    <menu_item_check
+     label="Flexible"
+     layout="topleft"
+     name="Flexible">
+        <on_check function="BuildObject.PasteCheckItem" parameter="Flexible" />
+        <on_click function="BuildObject.PasteDoToSelected" parameter="Flexible" />
+        <on_enable function="BuildObject.PasteEnable" parameter="Flexible" />
+    </menu_item_check>
     <menu_item_check
      label="Physics"
      layout="topleft"
-- 
cgit v1.2.3


From 090bb3e6de6d5cb70ed372748a76e391f61cb32e Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 2 Jun 2020 15:27:34 +0300
Subject: SL-13359 #1 Revert floater_tools and object panel changes

---
 .../newview/skins/default/textures/icons/Paste.png | Bin 530 -> 0 bytes
 indra/newview/skins/default/textures/textures.xml  |   1 -
 .../newview/skins/default/xui/en/floater_tools.xml | 176 +++------------------
 .../skins/default/xui/en/menu_build_paste.xml      |  38 -----
 4 files changed, 20 insertions(+), 195 deletions(-)
 delete mode 100644 indra/newview/skins/default/textures/icons/Paste.png
 delete mode 100644 indra/newview/skins/default/xui/en/menu_build_paste.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/Paste.png b/indra/newview/skins/default/textures/icons/Paste.png
deleted file mode 100644
index 10211df427..0000000000
Binary files a/indra/newview/skins/default/textures/icons/Paste.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index dd70354dd9..b041e6197c 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -186,7 +186,6 @@ with the same filename but different name
   <texture name="Conv_log_inbox" file_name="icons/Conv_log_inbox.png" preload="false" />
 
   <texture name="Copy" file_name="icons/Copy.png" preload="false" />
-  <texture name="Paste" file_name="icons/Paste.png" preload="false" />
   
   <texture name="DisclosureArrow_Opened_Off" file_name="widgets/DisclosureArrow_Opened_Off.png" preload="true" />
 
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 425af16261..0abee2ff80 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -1397,18 +1397,6 @@ even though the user gets a free copy.
          name="Object"
          top="16"
          width="295">
-            <panel.string name="paste_position">
-Paste Position
-[VALUE]
-            </panel.string>
-            <panel.string name="paste_size">
-Paste Size
-[VALUE]
-            </panel.string>
-            <panel.string name="paste_rotation">
-Paste Rotation
-[VALUE]
-            </panel.string>
             <check_box
              height="19"
              label="Locked"
@@ -1468,21 +1456,6 @@ Paste Rotation
              text_enabled_color="1 0 0.3 .7"
              top_pad="5"
              width="87" />
-            <button
-             top_delta="0"
-             left_pad="5"
-             height="19"
-             width="20"
-             follows="top|right"
-             layout="topleft"
-             tab_stop="false"
-             image_bottom_pad="1"
-             image_overlay="Copy"
-             image_hover_unselected="Toolbar_Middle_Over"
-             image_selected="Toolbar_Middle_Selected"
-             image_unselected="Toolbar_Middle_Off"
-             name="copy_pos_btn"
-             tool_tip="Copy Position" />
             <spinner
              follows="left|top"
              height="19"
@@ -1491,28 +1464,13 @@ Paste Rotation
              label="Y"
              label_width="10"
              layout="topleft"
-             left="10"
+             left_delta="0"
              max_val="512"
              min_val="-256"
              name="Pos Y"
              text_enabled_color="EmphasisColor"
              top_pad="3"
              width="87" />
-            <button
-             top_delta="0"
-             left_pad="5"
-             height="19"
-             width="20"
-             follows="top|right"
-             layout="topleft"
-             tab_stop="false"
-             image_bottom_pad="1"
-             image_overlay="Paste"
-             image_hover_unselected="Toolbar_Middle_Over"
-             image_selected="Toolbar_Middle_Selected"
-             image_unselected="Toolbar_Middle_Off"
-             name="paste_pos_btn"
-             tool_tip="Paste Position" />
             <spinner
              follows="left|top"
              height="19"
@@ -1521,7 +1479,7 @@ Paste Rotation
              label="Z"
              label_width="10"
              layout="topleft"
-             left="10"
+             left_delta="0"
              max_val="4096"
              name="Pos Z"
              text_enabled_color="0 0.8 1 .65"
@@ -1554,21 +1512,6 @@ Paste Rotation
              text_enabled_color="1 1 1 1"
              top_pad="5"
              width="87" />
-            <button
-             top_delta="0"
-             left_pad="5"
-             height="19"
-             width="20"
-             follows="top|right"
-             layout="topleft"
-             tab_stop="false"
-             image_bottom_pad="1"
-             image_overlay="Copy"
-             image_hover_unselected="Toolbar_Middle_Over"
-             image_selected="Toolbar_Middle_Selected"
-             image_unselected="Toolbar_Middle_Off"
-             name="copy_size_btn"
-             tool_tip="Copy Size" />
             <spinner
              follows="left|top"
              height="19"
@@ -1577,28 +1520,13 @@ Paste Rotation
              label="Y"
              label_width="10"
              layout="topleft"
-             left="10"
+             left_delta="0"
              max_val="64"
              min_val="0.01"
              name="Scale Y"
              text_enabled_color="1 1 1 1"
              top_pad="3"
              width="87" />
-            <button
-             top_delta="0"
-             left_pad="5"
-             height="19"
-             width="20"
-             follows="top|right"
-             layout="topleft"
-             tab_stop="false"
-             image_bottom_pad="1"
-             image_overlay="Paste"
-             image_hover_unselected="Toolbar_Middle_Over"
-             image_selected="Toolbar_Middle_Selected"
-             image_unselected="Toolbar_Middle_Off"
-             name="paste_size_btn"
-             tool_tip="Paste Size" />
             <spinner
              follows="left|top"
              height="19"
@@ -1607,7 +1535,7 @@ Paste Rotation
              label="Z"
              label_width="10"
              layout="topleft"
-             left="10"
+             left_delta="0"
              max_val="64"
              min_val="0.01"
              name="Scale Z"
@@ -1642,21 +1570,6 @@ Paste Rotation
              text_enabled_color="1 1 1 1"
              top_pad="5"
              width="87" />
-            <button
-             top_delta="0"
-             left_pad="5"
-             height="19"
-             width="20"
-             follows="top|right"
-             layout="topleft"
-             tab_stop="false"
-             image_bottom_pad="1"
-             image_overlay="Copy"
-             image_hover_unselected="Toolbar_Middle_Over"
-             image_selected="Toolbar_Middle_Selected"
-             image_unselected="Toolbar_Middle_Off"
-             name="copy_rot_btn"
-             tool_tip="Copy Rotation" />
             <spinner
              decimal_digits="2"
              follows="left|top"
@@ -1666,28 +1579,13 @@ Paste Rotation
              label="Y"
              label_width="10"
              layout="topleft"
-             left="10"
+             left_delta="0"
              max_val="9999"
              min_val="-9999"
              name="Rot Y"
              text_enabled_color="1 1 1 1"
              top_pad="3"
              width="87" />
-            <button
-             top_delta="0"
-             left_pad="5"
-             height="19"
-             width="20"
-             follows="top|right"
-             layout="topleft"
-             tab_stop="false"
-             image_bottom_pad="1"
-             image_overlay="Paste"
-             image_hover_unselected="Toolbar_Middle_Over"
-             image_selected="Toolbar_Middle_Selected"
-             image_unselected="Toolbar_Middle_Off"
-             name="paste_rot_btn"
-             tool_tip="Paste Rotation" />
             <spinner
              decimal_digits="2"
              follows="left|top"
@@ -1697,7 +1595,7 @@ Paste Rotation
              label="Z"
              label_width="10"
              layout="topleft"
-             left="10"
+             left_delta="0"
              max_val="9999"
              min_val="-9999"
              name="Rot Z"
@@ -1710,52 +1608,18 @@ Paste Rotation
              follows="left|top"
              height="10"
              layout="topleft"
-             left="135"
+             left="125"
              name="label basetype"
              top="5"
              width="150">
                 Prim Type
             </text>-->
-    		<button
-    		 follows="top|right"
-    		 height="23"
-    		 label="Copy"
-    		 layout="topleft"
-    		 left="135"
-    		 name="copy_params_btn"
-    		 tool_tip="Copy Parameters to Clipboard"
-             top="6"
-    		 width="53">
-    		</button>
-    		<button
-    		 follows="top|right"
-    		 height="23"
-    		 label="Paste"
-    		 layout="topleft"
-    		 left_pad="5"
-    		 name="paste_params_btn"
-    		 tool_tip="Paste Parameters from Clipboard"
-    		 width="53">
-    		</button>
-            <menu_button
-             menu_filename="menu_build_paste.xml"
-             follows="top|left"
-             height="23"
-             image_hover_unselected="Toolbar_Middle_Over"
-             image_overlay="OptionsMenu_Off"
-             image_selected="Toolbar_Middle_Selected"
-             image_unselected="Toolbar_Middle_Off"
-             layout="topleft"
-             left_pad="5"
-             name="paste_gear_btn"
-             tool_tip="Paste options"
-             width="31"/>
             <combo_box
              height="19"
              layout="topleft"
              name="comboBaseType"
-             top_pad="5"
-             left="135"
+             top="6"
+             left="125"
              width="150">
                 <combo_box.item
                  label="Box"
@@ -1834,7 +1698,7 @@ Paste Rotation
              follows="left|top"
              height="10"
              layout="topleft"
-             left="135"
+             left="125"
              name="text hollow"
              top_pad="6"
              width="68">
@@ -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" />
         </panel>
-        <panel
+         <panel
          label="Texture"
          help_topic="toolbox_texture_tab"
          name="Texture"
diff --git a/indra/newview/skins/default/xui/en/menu_build_paste.xml b/indra/newview/skins/default/xui/en/menu_build_paste.xml
deleted file mode 100644
index acbef528b8..0000000000
--- a/indra/newview/skins/default/xui/en/menu_build_paste.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toggleable_menu
- layout="topleft"
- name="Conversation Gear Menu">
-    <menu_item_check
-     label="Prim Parameters"
-     layout="topleft"
-     name="Parametric">
-        <on_check function="BuildObject.PasteCheckItem" parameter="Parametric" />
-        <on_click function="BuildObject.PasteDoToSelected" parameter="Parametric" />
-        <on_enable function="BuildObject.PasteEnable" parameter="Parametric" />
-    </menu_item_check>
-    <menu_item_check
-     label="Flexible"
-     layout="topleft"
-     name="Flexible">
-        <on_check function="BuildObject.PasteCheckItem" parameter="Flexible" />
-        <on_click function="BuildObject.PasteDoToSelected" parameter="Flexible" />
-        <on_enable function="BuildObject.PasteEnable" parameter="Flexible" />
-    </menu_item_check>
-    <menu_item_check
-     label="Physics"
-     layout="topleft"
-     name="Physics">
-        <on_check function="BuildObject.PasteCheckItem" parameter="Physics" />
-        <on_click function="BuildObject.PasteDoToSelected" parameter="Physics" />
-        <on_enable function="BuildObject.PasteEnable" parameter="Physics" />
-    </menu_item_check>
-    <menu_item_check
-     label="Light"
-     layout="topleft"
-     name="Light">
-        <on_check function="BuildObject.PasteCheckItem" parameter="Light" />
-        <on_click function="BuildObject.PasteDoToSelected" parameter="Light" />
-        <on_enable function="BuildObject.PasteEnable" parameter="Light" />
-    </menu_item_check>
-</toggleable_menu>
-
-- 
cgit v1.2.3


From f363646eb71d58007fc4936a67ad9c7bde9b93ac Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
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')

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" />
+            <menu_button
+             menu_filename="menu_copy_paste_pos.xml"
+             follows="top|left"
+             height="11"
+             image_disabled="OptionsMenu_Disabled"
+             image_selected="OptionsMenu_Press"
+             image_unselected="OptionsMenu_Off"
+             layout="topleft"
+             top_pad="10"
+             name="paste_pos_btn"
+             tool_tip="Paste options"
+             width="19"/>
         <text
              type="string"
              length="1"
@@ -1437,9 +1449,11 @@ even though the user gets a free copy.
              height="10"
              layout="topleft"
              name="label position"
-             top_pad="10"
+             tool_tip="Position (meters)"
+             left_pad="3"
+             top_delta="0"
              width="121">
-                Position (meters)
+                Position
             </text>
             <spinner
              follows="left|top"
@@ -1449,7 +1463,7 @@ even though the user gets a free copy.
              label="X"
              label_width="10"
              layout="topleft"
-             left_delta="0"
+             left_delta="-22"
              max_val="512"
              min_val="-256"
              name="Pos X"
@@ -1485,17 +1499,31 @@ even though the user gets a free copy.
              text_enabled_color="0 0.8 1 .65"
              top_pad="3"
              width="87" />
+            <menu_button
+             menu_filename="menu_copy_paste_size.xml"
+             follows="top|left"
+             height="11"
+             image_disabled="OptionsMenu_Disabled"
+             image_selected="OptionsMenu_Press"
+             image_unselected="OptionsMenu_Off"
+             layout="topleft"
+             left_delta="0"
+             top_pad="10"
+             name="paste_size_btn"
+             tool_tip="Paste options"
+             width="19"/>
             <text
              type="string"
              length="1"
              follows="left|top"
              height="10"
              layout="topleft"
-             left_delta="0"
+             left_pad="3"
+             top_delta="0"
              name="label size"
-             top_pad="6"
+             tool_tip="Size (meters)"
              width="121">
-                Size (meters)
+                Size
             </text>
             <spinner
              follows="left|top"
@@ -1505,7 +1533,7 @@ even though the user gets a free copy.
              label="X"
              label_width="10"
              layout="topleft"
-             left_delta="0"
+             left_delta="-22"
              max_val="64"
              min_val="0.01"
              name="Scale X"
@@ -1542,17 +1570,31 @@ even though the user gets a free copy.
              text_enabled_color="1 1 1 1"
              top_pad="3"
              width="87" />
+            <menu_button
+             menu_filename="menu_copy_paste_rot.xml"
+             follows="top|left"
+             height="11"
+             image_disabled="OptionsMenu_Disabled"
+             image_selected="OptionsMenu_Press"
+             image_unselected="OptionsMenu_Off"
+             layout="topleft"
+             left_delta="0"
+             top_pad="10"
+             name="paste_rot_btn"
+             tool_tip="Paste options"
+             width="19"/>
             <text
              type="string"
              length="1"
              follows="left|top"
              height="10"
              layout="topleft"
-             left_delta="0"
+             left_pad="3"
+             top_delta="0"
              name="label rotation"
-             top_pad="10"
+             tool_tip="Rotation (degrees)"
              width="121">
-                Rotation (degrees)
+                Rotation
             </text>
             <spinner
              decimal_digits="2"
@@ -1563,7 +1605,7 @@ even though the user gets a free copy.
              label="X"
              label_width="10"
              layout="topleft"
-             left_delta="0"
+             left_delta="-22"
              max_val="9999"
              min_val="-9999"
              name="Rot X"
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
new file mode 100644
index 0000000000..c2763af603
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_copy_paste_pos.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ layout="topleft"
+ name="Copy Paste Position Menu">
+    <menu_item_call
+     label="Copy Position"
+     layout="topleft"
+     name="pos_copy"
+     visible="true">
+        <on_click function="PanelObject.menuDoToSelected" parameter="pos_copy" />
+    </menu_item_call>
+    <menu_item_call
+     label="Paste Position"
+     layout="topleft"
+     name="pos_paste"
+     visible="true">
+      <on_click function="PanelObject.menuDoToSelected" parameter="pos_paste" />
+      <on_enable function="PanelObject.menuEnable" parameter="pos_paste" />
+    </menu_item_call>
+</toggleable_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
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 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ layout="topleft"
+ name="Copy Paste Rotation Menu">
+    <menu_item_call
+     label="Copy Rotation"
+     layout="topleft"
+     name="rot_copy"
+     visible="true">
+        <on_click function="PanelObject.menuDoToSelected" parameter="rot_copy" />
+    </menu_item_call>
+    <menu_item_call
+     label="Paste Rotation"
+     layout="topleft"
+     name="rot_paste"
+     visible="true">
+      <on_click function="PanelObject.menuDoToSelected" parameter="rot_paste" />
+      <on_enable function="PanelObject.menuEnable" parameter="rot_paste" />
+    </menu_item_call>
+</toggleable_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
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 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ layout="topleft"
+ name="Copy Paste Size Menu">
+    <menu_item_call
+     label="Copy Size"
+     layout="topleft"
+     name="size_copy"
+     visible="true">
+        <on_click function="PanelObject.menuDoToSelected" parameter="size_copy" />
+    </menu_item_call>
+    <menu_item_call
+     label="Paste Size"
+     layout="topleft"
+     name="size_paste"
+     visible="true">
+      <on_click function="PanelObject.menuDoToSelected" parameter="size_paste" />
+      <on_enable function="PanelObject.menuEnable" parameter="size_paste" />
+    </menu_item_call>
+</toggleable_menu>
+
-- 
cgit v1.2.3


From 30f1038351734b946be9a6f910e4e0eca82be1d4 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 3 Jun 2020 16:12:11 +0300
Subject: SL-13359 #3 UI changes for panel object

---
 .../textures/icons/ClipboardSmallMenu_Disabled.png | Bin 0 -> 218 bytes
 .../textures/icons/ClipboardSmallMenu_Off.png      | Bin 0 -> 217 bytes
 .../textures/icons/ClipboardSmallMenu_Press.png    | Bin 0 -> 215 bytes
 indra/newview/skins/default/textures/textures.xml  |   4 ++
 .../newview/skins/default/xui/en/floater_tools.xml |  48 +++++++++++++--------
 5 files changed, 33 insertions(+), 19 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Disabled.png
 create mode 100644 indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Off.png
 create mode 100644 indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Press.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Disabled.png b/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Disabled.png
new file mode 100644
index 0000000000..63b4bd2127
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Off.png b/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Off.png
new file mode 100644
index 0000000000..4200182b0c
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Off.png differ
diff --git a/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Press.png b/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Press.png
new file mode 100644
index 0000000000..e12887f489
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Press.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 7325d836d2..b7fa1e72f8 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -438,6 +438,10 @@ with the same filename but different name
   <texture name="OptionsMenu_Off" file_name="icons/OptionsMenu_Off.png" preload="false" />
   <texture name="OptionsMenu_Press" file_name="icons/OptionsMenu_Press.png" preload="false" />
 
+  <texture name="ClipboardSmallMenu_Disabled" file_name="icons/ClipboardSmallMenu_Disabled.png" preload="false" />
+  <texture name="ClipboardSmallMenu_Off" file_name="icons/ClipboardSmallMenu_Off.png" preload="false" />
+  <texture name="ClipboardSmallMenu_Press" file_name="icons/ClipboardSmallMenu_Press.png" preload="false" />
+
   <texture name="OutboxStatus_Success" file_name="green_checkmark.png" preload="false" />
   <texture name="OutboxStatus_Warning" file_name="icons/pop_up_caution.png" preload="false" />
   <texture name="OutboxStatus_Error" file_name="red_x.png" preload="false" />
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" />
+            <view_border
+             bevel_style="none"
+             follows="top|left"
+             height="0"
+             layout="topleft"
+             left_delta="0"
+             name="lod_tab_border"
+             top_pad="10"
+             width="95" />
             <menu_button
              menu_filename="menu_copy_paste_pos.xml"
              follows="top|left"
              height="11"
-             image_disabled="OptionsMenu_Disabled"
-             image_selected="OptionsMenu_Press"
-             image_unselected="OptionsMenu_Off"
+             image_disabled="ClipboardSmallMenu_Disabled"
+             image_selected="ClipboardSmallMenu_Press"
+             image_unselected="ClipboardSmallMenu_Off"
              layout="topleft"
-             top_pad="10"
-             name="paste_pos_btn"
+             left_delta="0"
+             top_pad="13"
+             name="clipboard_pos_btn"
              tool_tip="Paste options"
              width="19"/>
-        <text
+            <text
              type="string"
              length="1"
              follows="left|top"
@@ -1468,7 +1478,7 @@ even though the user gets a free copy.
              min_val="-256"
              name="Pos X"
              text_enabled_color="1 0 0.3 .7"
-             top_pad="5"
+             top_pad="8"
              width="87" />
             <spinner
              follows="left|top"
@@ -1503,13 +1513,13 @@ even though the user gets a free copy.
              menu_filename="menu_copy_paste_size.xml"
              follows="top|left"
              height="11"
-             image_disabled="OptionsMenu_Disabled"
-             image_selected="OptionsMenu_Press"
-             image_unselected="OptionsMenu_Off"
+             image_disabled="ClipboardSmallMenu_Disabled"
+             image_selected="ClipboardSmallMenu_Press"
+             image_unselected="ClipboardSmallMenu_Off"
              layout="topleft"
              left_delta="0"
-             top_pad="10"
-             name="paste_size_btn"
+             top_pad="13"
+             name="clipboard_size_btn"
              tool_tip="Paste options"
              width="19"/>
             <text
@@ -1538,7 +1548,7 @@ even though the user gets a free copy.
              min_val="0.01"
              name="Scale X"
              text_enabled_color="1 1 1 1"
-             top_pad="5"
+             top_pad="8"
              width="87" />
             <spinner
              follows="left|top"
@@ -1574,13 +1584,13 @@ even though the user gets a free copy.
              menu_filename="menu_copy_paste_rot.xml"
              follows="top|left"
              height="11"
-             image_disabled="OptionsMenu_Disabled"
-             image_selected="OptionsMenu_Press"
-             image_unselected="OptionsMenu_Off"
+             image_disabled="ClipboardSmallMenu_Disabled"
+             image_selected="ClipboardSmallMenu_Press"
+             image_unselected="ClipboardSmallMenu_Off"
              layout="topleft"
              left_delta="0"
-             top_pad="10"
-             name="paste_rot_btn"
+             top_pad="13"
+             name="clipboard_rot_btn"
              tool_tip="Paste options"
              width="19"/>
             <text
@@ -1610,7 +1620,7 @@ even though the user gets a free copy.
              min_val="-9999"
              name="Rot X"
              text_enabled_color="1 1 1 1"
-             top_pad="5"
+             top_pad="8"
              width="87" />
             <spinner
              decimal_digits="2"
-- 
cgit v1.2.3


From 6be7881a514ef768c74f2ec1514e1fea833a359b Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
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')

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)
             </text>
             <spinner
              follows="left|top"
@@ -1473,7 +1473,7 @@ even though the user gets a free copy.
              label="X"
              label_width="10"
              layout="topleft"
-             left_delta="-22"
+             left_delta="-27"
              max_val="512"
              min_val="-256"
              name="Pos X"
@@ -1528,12 +1528,12 @@ even though the user gets a free copy.
              follows="left|top"
              height="10"
              layout="topleft"
-             left_pad="3"
+             left_pad="8"
              top_delta="0"
              name="label size"
              tool_tip="Size (meters)"
              width="121">
-                Size
+                Size (m)
             </text>
             <spinner
              follows="left|top"
@@ -1543,7 +1543,7 @@ even though the user gets a free copy.
              label="X"
              label_width="10"
              layout="topleft"
-             left_delta="-22"
+             left_delta="-27"
              max_val="64"
              min_val="0.01"
              name="Scale X"
@@ -1599,12 +1599,12 @@ even though the user gets a free copy.
              follows="left|top"
              height="10"
              layout="topleft"
-             left_pad="3"
+             left_pad="8"
              top_delta="0"
              name="label rotation"
              tool_tip="Rotation (degrees)"
              width="121">
-                Rotation
+                Rotation (°)
             </text>
             <spinner
              decimal_digits="2"
@@ -1615,7 +1615,7 @@ even though the user gets a free copy.
              label="X"
              label_width="10"
              layout="topleft"
-             left_delta="-22"
+             left_delta="-27"
              max_val="9999"
              min_val="-9999"
              name="Rot X"
-- 
cgit v1.2.3


From 1310fac3b10b3927cb502008c156c16631b97663 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 17 Jun 2020 23:38:55 +0300
Subject: SL-13359 #5 Implemented revised changes

---
 .../textures/icons/ClipboardMenu_Disabled.png      | Bin 0 -> 231 bytes
 .../default/textures/icons/ClipboardMenu_Off.png   | Bin 0 -> 231 bytes
 .../default/textures/icons/ClipboardMenu_Press.png | Bin 0 -> 224 bytes
 indra/newview/skins/default/textures/textures.xml  |   3 ++
 .../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 +++++++++++++----
 9 files changed, 114 insertions(+), 19 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/ClipboardMenu_Disabled.png
 create mode 100644 indra/newview/skins/default/textures/icons/ClipboardMenu_Off.png
 create mode 100644 indra/newview/skins/default/textures/icons/ClipboardMenu_Press.png
 create mode 100644 indra/newview/skins/default/xui/en/menu_copy_paste_generic.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/ClipboardMenu_Disabled.png b/indra/newview/skins/default/textures/icons/ClipboardMenu_Disabled.png
new file mode 100644
index 0000000000..9a81c5f94b
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/ClipboardMenu_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/icons/ClipboardMenu_Off.png b/indra/newview/skins/default/textures/icons/ClipboardMenu_Off.png
new file mode 100644
index 0000000000..88012cf8d1
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/ClipboardMenu_Off.png differ
diff --git a/indra/newview/skins/default/textures/icons/ClipboardMenu_Press.png b/indra/newview/skins/default/textures/icons/ClipboardMenu_Press.png
new file mode 100644
index 0000000000..ab02e7d42d
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/ClipboardMenu_Press.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index b7fa1e72f8..473b074213 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -441,6 +441,9 @@ with the same filename but different name
   <texture name="ClipboardSmallMenu_Disabled" file_name="icons/ClipboardSmallMenu_Disabled.png" preload="false" />
   <texture name="ClipboardSmallMenu_Off" file_name="icons/ClipboardSmallMenu_Off.png" preload="false" />
   <texture name="ClipboardSmallMenu_Press" file_name="icons/ClipboardSmallMenu_Press.png" preload="false" />
+  <texture name="ClipboardMenu_Disabled" file_name="icons/ClipboardMenu_Disabled.png" preload="false" />
+  <texture name="ClipboardMenu_Off" file_name="icons/ClipboardMenu_Off.png" preload="false" />
+  <texture name="ClipboardMenu_Press" file_name="icons/ClipboardMenu_Press.png" preload="false" />
 
   <texture name="OutboxStatus_Success" file_name="green_checkmark.png" preload="false" />
   <texture name="OutboxStatus_Warning" file_name="icons/pop_up_caution.png" preload="false" />
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" />
             <menu_button
@@ -1666,13 +1666,23 @@ even though the user gets a free copy.
              width="150">
                 Prim Type
             </text>-->
+
+            <view_border
+             bevel_style="none"
+             follows="top|left"
+             layout="topleft"
+             name="object_vertical"
+             left="117"
+             top="6"
+             height="500"
+             width="0"/>
             <combo_box
              height="19"
              layout="topleft"
              name="comboBaseType"
              top="6"
              left="125"
-             width="150">
+             width="125">
                 <combo_box.item
                  label="Box"
                  name="Box"
@@ -1706,15 +1716,28 @@ even though the user gets a free copy.
                  name="Sculpted"
                  value="Sculpted" />
             </combo_box>
+            <menu_button
+              menu_filename="menu_copy_paste_generic.xml"
+              follows="top|left"
+              height="15"
+              image_disabled="ClipboardMenu_Disabled"
+              image_selected="ClipboardMenu_Press"
+              image_unselected="ClipboardMenu_Off"
+              layout="topleft"
+              left_pad="8"
+              top_delta="2"
+              name="clipboard_params_btn"
+              tool_tip="Paste options"
+              width="22"/>
             <text
              type="string"
              length="1"
              follows="left|top"
              height="10"
              layout="topleft"
-             left_delta="0"
+             left="125"
              name="text cut"
-             top_pad="5"
+             top_pad="7"
              width="150">
                 Path Cut (begin/end)
             </text>
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 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ layout="topleft"
+ name="Copy Paste Generic Menu">
+    <menu_item_call
+     label="Copy"
+     layout="topleft"
+     name="params_copy"
+     visible="true">
+       <on_click function="PanelObject.menuDoToSelected" parameter="params_copy" />
+    </menu_item_call>
+    <menu_item_call
+     label="Paste"
+     layout="topleft"
+     name="params_paste"
+     visible="true">
+       <on_click function="PanelObject.menuDoToSelected" parameter="params_paste" />
+       <on_enable function="PanelObject.menuEnable" parameter="params_paste" />
+    </menu_item_call>
+</toggleable_menu>
+
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">
     <menu_item_call
-     label="Copy Position"
+     label="Copy all"
+     layout="topleft"
+     name="psr_copy"
+     visible="true">
+       <on_click function="PanelObject.menuDoToSelected" parameter="psr_copy" />
+       <on_enable function="PanelObject.menuEnable" parameter="psr_copy" />
+    </menu_item_call>
+    <menu_item_call
+     label="Copy position"
      layout="topleft"
      name="pos_copy"
      visible="true">
-        <on_click function="PanelObject.menuDoToSelected" parameter="pos_copy" />
+       <on_click function="PanelObject.menuDoToSelected" parameter="pos_copy" />
+    </menu_item_call>
+    <menu_item_call
+     label="Paste all"
+     layout="topleft"
+     name="psr_paste"
+     visible="true">
+       <on_click function="PanelObject.menuDoToSelected" parameter="psr_paste" />
+       <on_enable function="PanelObject.menuEnable" parameter="psr_paste" />
     </menu_item_call>
     <menu_item_call
-     label="Paste Position"
+     label="Paste position"
      layout="topleft"
      name="pos_paste"
      visible="true">
-      <on_click function="PanelObject.menuDoToSelected" parameter="pos_paste" />
-      <on_enable function="PanelObject.menuEnable" parameter="pos_paste" />
+       <on_click function="PanelObject.menuDoToSelected" parameter="pos_paste" />
+       <on_enable function="PanelObject.menuEnable" parameter="pos_paste" />
     </menu_item_call>
 </toggleable_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">
     <menu_item_call
-     label="Copy Rotation"
+     label="Copy all"
+     layout="topleft"
+     name="psr_copy"
+     visible="true">
+       <on_click function="PanelObject.menuDoToSelected" parameter="psr_copy" />
+       <on_enable function="PanelObject.menuEnable" parameter="rot_paste" />
+    </menu_item_call>
+    <menu_item_call
+     label="Copy rotation"
      layout="topleft"
      name="rot_copy"
      visible="true">
-        <on_click function="PanelObject.menuDoToSelected" parameter="rot_copy" />
+       <on_click function="PanelObject.menuDoToSelected" parameter="rot_copy" />
+    </menu_item_call>
+    <menu_item_call
+     label="Paste all"
+     layout="topleft"
+     name="psr_paste"
+     visible="true">
+       <on_click function="PanelObject.menuDoToSelected" parameter="psr_paste" />
+       <on_enable function="PanelObject.menuEnable" parameter="psr_paste" />
     </menu_item_call>
     <menu_item_call
-     label="Paste Rotation"
+     label="Paste rotation"
      layout="topleft"
      name="rot_paste"
      visible="true">
-      <on_click function="PanelObject.menuDoToSelected" parameter="rot_paste" />
-      <on_enable function="PanelObject.menuEnable" parameter="rot_paste" />
+       <on_click function="PanelObject.menuDoToSelected" parameter="rot_paste" />
+       <on_enable function="PanelObject.menuEnable" parameter="rot_paste" />
     </menu_item_call>
 </toggleable_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">
     <menu_item_call
-     label="Copy Size"
+     label="Copy all"
+     layout="topleft"
+     name="psr_copy"
+     visible="true">
+       <on_click function="PanelObject.menuDoToSelected" parameter="psr_copy" />
+       <on_enable function="PanelObject.menuEnable" parameter="psr_copy" />
+    </menu_item_call>
+    <menu_item_call
+     label="Copy size"
      layout="topleft"
      name="size_copy"
      visible="true">
-        <on_click function="PanelObject.menuDoToSelected" parameter="size_copy" />
+       <on_click function="PanelObject.menuDoToSelected" parameter="size_copy" />
+    </menu_item_call>
+    <menu_item_call
+     label="Paste all"
+     layout="topleft"
+     name="psr_paste"
+     visible="true">
+       <on_click function="PanelObject.menuDoToSelected" parameter="psr_paste" />
+       <on_enable function="PanelObject.menuEnable" parameter="psr_paste" />
     </menu_item_call>
     <menu_item_call
-     label="Paste Size"
+     label="Paste size"
      layout="topleft"
      name="size_paste"
      visible="true">
-      <on_click function="PanelObject.menuDoToSelected" parameter="size_paste" />
-      <on_enable function="PanelObject.menuEnable" parameter="size_paste" />
+       <on_click function="PanelObject.menuDoToSelected" parameter="size_paste" />
+       <on_enable function="PanelObject.menuEnable" parameter="size_paste" />
     </menu_item_call>
 </toggleable_menu>
 
-- 
cgit v1.2.3


From ef8d42a05ecd611c2bd16492c6727813bdcfd6bb Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
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')

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)
             </text>
@@ -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
             </text>
@@ -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
             </text>
@@ -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)
             </text>
@@ -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
             </text>
             <text
-			 visible="false"
+             visible="false"
              type="string"
              length="1"
              follows="left|top"
@@ -1954,7 +1954,7 @@ even though the user gets a free copy.
              layout="topleft"
              left="125"
              name="text topshear"
-             top_pad="3"
+             top_pad="5"
              width="141">
                 Top Shear
             </text>
@@ -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)
             </text>
             <text
-			 visible="false"
+             visible="false"
              type="string"
              length="1"
              follows="left|top"
@@ -2061,7 +2061,7 @@ even though the user gets a free copy.
              layout="topleft"
              left="125"
              name="text taper2"
-             top_pad="3"
+             top_pad="7"
              width="150">
                 Taper
             </text>
@@ -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
             </text>
-- 
cgit v1.2.3


From d95f86c5931db5b025e0923071c9b3a08bb25301 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
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')

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" />
             </combo_box>
             <menu_button
-              menu_filename="menu_copy_paste_generic.xml"
+              menu_filename="menu_copy_paste_object.xml"
               follows="top|left"
               height="15"
               image_disabled="ClipboardMenu_Disabled"
@@ -1726,7 +1726,7 @@ even though the user gets a free copy.
               layout="topleft"
               left_pad="8"
               top_delta="2"
-              name="clipboard_params_btn"
+              name="clipboard_obj_params_btn"
               tool_tip="Paste options"
               width="22"/>
             <text
@@ -2232,6 +2232,19 @@ even though the user gets a free copy.
 	<panel.string name="None">None</panel.string>
 	<panel.string name="Prim">Prim</panel.string>
 	<panel.string name="Convex Hull">Convex Hull</panel.string>
+            <menu_button
+              menu_filename="menu_copy_paste_features.xml"
+              follows="top|left"
+              height="15"
+              image_disabled="ClipboardMenu_Disabled"
+              image_selected="ClipboardMenu_Press"
+              image_unselected="ClipboardMenu_Off"
+              layout="topleft"
+              left="258"
+              top="8"
+              name="clipboard_features_params_btn"
+              tool_tip="Paste options"
+              width="22"/>
             <text
              type="string"
              length="1"
@@ -2384,6 +2397,15 @@ even though the user gets a free copy.
              name="FlexForceZ"
              top_pad="4"
              width="128" />
+            <view_border
+             bevel_style="none"
+             follows="top|left"
+             height="0"
+             layout="topleft"
+             left="8"
+             name="object_horizontal"
+             top_pad="10"
+             width="278" />
 
             <check_box
              height="16"
@@ -2392,7 +2414,7 @@ even though the user gets a free copy.
              left="10"
              name="Light Checkbox Ctrl"
              tool_tip="Causes object to emit light"
-             top_pad="15"
+             top_pad="8"
              width="60" />
             <color_swatch
              can_apply_immediately="true"
@@ -2419,6 +2441,19 @@ even though the user gets a free copy.
             name="light texture control"
             tool_tip="Click to choose a projection image (only has effect with deferred rendering enabled)"
             width="32" />
+         <menu_button
+              menu_filename="menu_copy_paste_light.xml"
+              follows="top|left"
+              height="15"
+              image_disabled="ClipboardMenu_Disabled"
+              image_selected="ClipboardMenu_Press"
+              image_unselected="ClipboardMenu_Off"
+              layout="topleft"
+              left="258"
+              top_delta="0"
+              name="clipboard_light_params_btn"
+              tool_tip="Paste options"
+              width="22"/>
           <spinner
              follows="left|top"
              height="19"
@@ -2428,7 +2463,7 @@ even though the user gets a free copy.
              layout="topleft"
              left="10"
              name="Light Intensity"
-             top_pad="3"
+             top_pad="26"
              width="128" />
           <spinner bottom_delta="0"
                    decimal_digits="3"
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
new file mode 100644
index 0000000000..dd58658472
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_copy_paste_features.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ layout="topleft"
+ name="Copy Paste Generic Menu">
+    <menu_item_call
+     label="Copy"
+     layout="topleft"
+     name="params_copy"
+     visible="true">
+       <on_click function="PanelVolume.menuDoToSelected" parameter="features_copy" />
+    </menu_item_call>
+    <menu_item_call
+     label="Paste"
+     layout="topleft"
+     name="params_paste"
+     visible="true">
+       <on_click function="PanelVolume.menuDoToSelected" parameter="features_paste" />
+       <on_enable function="PanelVolume.menuEnable" parameter="features_paste" />
+    </menu_item_call>
+</toggleable_menu>
+
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 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toggleable_menu
- layout="topleft"
- name="Copy Paste Generic Menu">
-    <menu_item_call
-     label="Copy"
-     layout="topleft"
-     name="params_copy"
-     visible="true">
-       <on_click function="PanelObject.menuDoToSelected" parameter="params_copy" />
-    </menu_item_call>
-    <menu_item_call
-     label="Paste"
-     layout="topleft"
-     name="params_paste"
-     visible="true">
-       <on_click function="PanelObject.menuDoToSelected" parameter="params_paste" />
-       <on_enable function="PanelObject.menuEnable" parameter="params_paste" />
-    </menu_item_call>
-</toggleable_menu>
-
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 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ layout="topleft"
+ name="Copy Paste Generic Menu">
+    <menu_item_call
+     label="Copy"
+     layout="topleft"
+     name="params_copy"
+     visible="true">
+       <on_click function="PanelVolume.menuDoToSelected" parameter="light_copy" />
+    </menu_item_call>
+    <menu_item_call
+     label="Paste"
+     layout="topleft"
+     name="params_paste"
+     visible="true">
+       <on_click function="PanelVolume.menuDoToSelected" parameter="light_paste" />
+       <on_enable function="PanelVolume.menuEnable" parameter="light_paste" />
+    </menu_item_call>
+</toggleable_menu>
+
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 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ layout="topleft"
+ name="Copy Paste Generic Menu">
+    <menu_item_call
+     label="Copy"
+     layout="topleft"
+     name="params_copy"
+     visible="true">
+       <on_click function="PanelObject.menuDoToSelected" parameter="params_copy" />
+    </menu_item_call>
+    <menu_item_call
+     label="Paste"
+     layout="topleft"
+     name="params_paste"
+     visible="true">
+       <on_click function="PanelObject.menuDoToSelected" parameter="params_paste" />
+       <on_enable function="PanelObject.menuEnable" parameter="params_paste" />
+    </menu_item_call>
+</toggleable_menu>
+
-- 
cgit v1.2.3


From 15f02e2da231827a7cac18a2444c212efc8c1d1c Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
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')

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 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toggleable_menu
- layout="topleft"
- name="Conversation Gear Menu">
-    <menu_item_check
-     label="Color"
-     layout="topleft"
-     name="Color">
-        <on_check function="BuildFace.PasteCheckItem" parameter="Color" />
-        <on_click function="BuildFace.PasteDoToSelected" parameter="Color" />
-        <on_enable function="BuildFace.PasteEnable" parameter="Color" />
-    </menu_item_check>
-    <menu_item_check
-     label="Transparency"
-     layout="topleft"
-     name="Transparency">
-        <on_check function="BuildFace.PasteCheckItem" parameter="Transparency" />
-        <on_click function="BuildFace.PasteDoToSelected" parameter="Transparency" />
-        <on_enable function="BuildFace.PasteEnable" parameter="Transparency" />
-    </menu_item_check>
-    <menu_item_check
-     label="Glow"
-     layout="topleft"
-     name="Glow">
-        <on_check function="BuildFace.PasteCheckItem" parameter="Glow" />
-        <on_click function="BuildFace.PasteDoToSelected" parameter="Glow" />
-        <on_enable function="BuildFace.PasteEnable" parameter="Glow" />
-    </menu_item_check>
-    <menu_item_check
-     label="Texture"
-     layout="topleft"
-     name="Diffuse">
-        <on_check function="BuildFace.PasteCheckItem" parameter="Diffuse" />
-        <on_click function="BuildFace.PasteDoToSelected" parameter="Diffuse" />
-        <on_enable function="BuildFace.PasteEnable" parameter="Diffuse" />
-    </menu_item_check>
-    <menu_item_check
-     label="Bumpiness"
-     layout="topleft"
-     name="Normal">
-        <on_check function="BuildFace.PasteCheckItem" parameter="Normal" />
-        <on_click function="BuildFace.PasteDoToSelected" parameter="Normal" />
-        <on_enable function="BuildFace.PasteEnable" parameter="Normal" />
-    </menu_item_check>
-    <menu_item_check
-     label="Shininess"
-     layout="topleft"
-     name="Specular">
-        <on_check function="BuildFace.PasteCheckItem" parameter="Specular" />
-        <on_click function="BuildFace.PasteDoToSelected" parameter="Specular" />
-        <on_enable function="BuildFace.PasteEnable" parameter="Specular" />
-    </menu_item_check>
-    <menu_item_check
-     label="Mapping"
-     layout="topleft"
-     name="Mapping">
-        <on_check function="BuildFace.PasteCheckItem" parameter="Mapping" />
-        <on_click function="BuildFace.PasteDoToSelected" parameter="Mapping" />
-        <on_enable function="BuildFace.PasteEnable" parameter="Mapping" />
-    </menu_item_check>
-    <menu_item_check
-     label="Media"
-     layout="topleft"
-     name="Media">
-        <on_check function="BuildFace.PasteCheckItem" parameter="Media" />
-        <on_click function="BuildFace.PasteDoToSelected" parameter="Media" />
-        <on_enable function="BuildFace.PasteEnable" parameter="Media" />
-    </menu_item_check>
-</toggleable_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 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" />
             <check_box
              height="19"
              label="Full Bright"
@@ -93,47 +93,12 @@
              name="checkbox fullbright"
              top_pad="4"
              width="81" />
-            <button
-             follows="top|right"
-             height="23"
-             label="Copy"
-             layout="topleft"
-             left="240"
-             name="copy_face_btn"
-             tool_tip="Copy Parameters to Clipboard"
-             top="6"
-             width="53">
-            </button>
-            <button
-             follows="top|right"
-             height="23"
-             label="Paste"
-             layout="topleft"
-             name="paste_face_btn"
-             tool_tip="Paste Parameters from Clipboard"
-             top_pad="5"
-             width="53">
-            </button>
-            <menu_button
-             menu_filename="menu_texture_paste.xml"
-             follows="top|left"
-             height="23"
-             image_hover_unselected="Toolbar_Middle_Over"
-             image_overlay="OptionsMenu_Off"
-             image_selected="Toolbar_Middle_Selected"
-             image_unselected="Toolbar_Middle_Off"
-             layout="topleft"
-             left_delta="20"
-             name="paste_face_gear_btn"
-             tool_tip="Paste options"
-             top_pad="5"
-             width="31"/>
             <combo_box
              height="23"
              layout="topleft"
              left="10"
              name="combobox matmedia"
-             top="70"
+             top_pad="5"
              width="100">
                 <combo_box.item
                  label="Materials"
@@ -148,10 +113,10 @@
             control_name="ComboMaterialType"
             height="50"
             layout="topleft"
-            left_pad="5"
+            left_pad="20"
             top_delta="-10"
             width="150"
-            visible = "true"
+            visible = "false"
             name="radio_material_type">
                 <radio_item
                 label="Texture (diffuse)"
@@ -174,7 +139,7 @@
                 layout="topleft"
                 top_pad="1"
                 value="2"/>
-            </radio_group>
+            </radio_group> 
             <check_box
              control_name="SyncMaterialSettings"
              follows="top|left"
@@ -193,7 +158,7 @@
              fallback_image="materials_ui_x_24.png"
              follows="left|top"
              height="80"
-             label="Texture"
+             label="Texture       "
              layout="topleft"
              left="10"
              name="texture control"
@@ -270,7 +235,7 @@
              fallback_image="materials_ui_x_24.png"
              follows="left|top"
              height="80"
-             label="Texture"
+             label="Texture       "
              layout="topleft"
              left="10"
              name="bumpytexture control"
@@ -384,7 +349,7 @@
              fallback_image="materials_ui_x_24.png"
              follows="left|top"
              height="80"
-             label="Texture"
+             label="Texture       "
              layout="topleft"
              left="10"
              name="shinytexture control"
-- 
cgit v1.2.3


From 052e1adcd052e5e9a9fc29612daf6ec5d568f895 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
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')

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 @@
 <floater
  positioning="cascading"
  legacy_header_height="18"
- height="600"
+ height="609"
  layout="topleft"
  bg_opaque_image="Window_NoTitle_Foreground"
  bg_alpha_image="Window_NoTitle_Background"
@@ -820,7 +820,7 @@
     width="282"/>
     <tab_container
      follows="left|top"
-     height="410"
+     height="426"
      halign="center"
      left="0"
      name="Object Info Tabs"
@@ -2685,7 +2685,7 @@ even though the user gets a free copy.
              border_visible="true"
              bevel_style="in"
              follows="left|top|right"
-             height="325"
+             height="335"
              layout="topleft"
              left="10"
              name="contents_inventory"
diff --git a/indra/newview/skins/default/xui/en/menu_copy_paste_color.xml b/indra/newview/skins/default/xui/en/menu_copy_paste_color.xml
new file mode 100644
index 0000000000..4c12180daf
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_copy_paste_color.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ layout="topleft"
+ name="Copy Paste Color Menu">
+    <menu_item_call
+     label="Copy"
+     layout="topleft"
+     name="params_copy"
+     visible="true">
+       <on_click function="PanelFace.menuDoToSelected" parameter="color_copy" />
+    </menu_item_call>
+    <menu_item_call
+     label="Paste"
+     layout="topleft"
+     name="params_paste"
+     visible="true">
+       <on_click function="PanelFace.menuDoToSelected" parameter="color_paste" />
+       <on_enable function="PanelFace.menuEnable" parameter="color_paste" />
+    </menu_item_call>
+</toggleable_menu>
+
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 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <toggleable_menu
  layout="topleft"
- name="Copy Paste Generic Menu">
+ name="Copy Paste Features Menu">
     <menu_item_call
      label="Copy"
      layout="topleft"
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
index 941efe7d01..5de23dfee3 100644
--- a/indra/newview/skins/default/xui/en/menu_copy_paste_light.xml
+++ b/indra/newview/skins/default/xui/en/menu_copy_paste_light.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <toggleable_menu
  layout="topleft"
- name="Copy Paste Generic Menu">
+ name="Copy Paste Light Menu">
     <menu_item_call
      label="Copy"
      layout="topleft"
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
index 8e016e4a1c..bdc4537a9d 100644
--- a/indra/newview/skins/default/xui/en/menu_copy_paste_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_copy_paste_object.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <toggleable_menu
  layout="topleft"
- name="Copy Paste Generic Menu">
+ name="Copy Paste Object Menu">
     <menu_item_call
      label="Copy"
      layout="topleft"
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
new file mode 100644
index 0000000000..8267041502
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_copy_paste_texture.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ layout="topleft"
+ name="Copy Paste Texture Menu">
+    <menu_item_call
+     label="Copy"
+     layout="topleft"
+     name="params_copy"
+     visible="true">
+       <on_click function="PanelVolume.menuDoToSelected" parameter="texture_copy" />
+    </menu_item_call>
+    <menu_item_call
+     label="Paste"
+     layout="topleft"
+     name="params_paste"
+     visible="true">
+       <on_click function="PanelVolume.menuDoToSelected" parameter="texture_paste" />
+       <on_enable function="PanelVolume.menuEnable" parameter="texture_paste" />
+    </menu_item_call>
+</toggleable_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">
+            <menu_button
+             menu_filename="menu_copy_paste_color.xml"
+             follows="top|left"
+             height="15"
+             image_disabled="ClipboardMenu_Disabled"
+             image_selected="ClipboardMenu_Press"
+             image_unselected="ClipboardMenu_Off"
+             layout="topleft"
+             left="258"
+             top="8"
+             name="clipboard_color_params_btn"
+             tool_tip="Paste options"
+             width="22"/>
             <text
              type="string"
              length="1"
@@ -36,7 +49,7 @@
              name="colorswatch"
              tool_tip="Click to open color picker"
              top="20"
-             width="64" />
+             width="54" />
             <text
              type="string"
              length="1"
@@ -84,7 +97,7 @@
              left_delta="0"
              name="glow"
              top_pad="4"
-             width="80" />
+             width="77" />
             <check_box
              height="19"
              label="Full Bright"
@@ -93,13 +106,22 @@
              name="checkbox fullbright"
              top_pad="4"
              width="81" />
+            <view_border
+             bevel_style="none"
+             follows="top|left"
+             height="0"
+             layout="topleft"
+             left="8"
+             name="object_horizontal"
+             top_pad="4"
+             width="278" />
             <combo_box
              height="23"
              layout="topleft"
              left="10"
              name="combobox matmedia"
-             top_pad="5"
-             width="100">
+             top_pad="17"
+             width="90">
                 <combo_box.item
                  label="Materials"
                  name="Materials"
@@ -113,7 +135,7 @@
             control_name="ComboMaterialType"
             height="50"
             layout="topleft"
-            left_pad="20"
+            left_pad="5"
             top_delta="-10"
             width="150"
             visible = "false"
@@ -139,7 +161,20 @@
                 layout="topleft"
                 top_pad="1"
                 value="2"/>
-            </radio_group> 
+            </radio_group>
+            <menu_button
+                menu_filename="menu_copy_paste_texture.xml"
+                follows="top|left"
+                height="15"
+                image_disabled="ClipboardMenu_Disabled"
+                image_selected="ClipboardMenu_Press"
+                image_unselected="ClipboardMenu_Off"
+                layout="topleft"
+                left="258"
+                top_delta="0"
+                name="clipboard_texture_params_btn"
+                tool_tip="Paste options"
+                width="22"/>
             <check_box
              control_name="SyncMaterialSettings"
              follows="top|left"
@@ -150,7 +185,7 @@
              left="8"
              name="checkbox_sync_settings"
              tool_tip="Adjust all maps repeats simultaneously"
-             top_pad="-16"
+             top_pad="19"
              width="160" />
             <texture_picker
              can_apply_immediately="true"
@@ -774,7 +809,7 @@
        follows="left|top"
        layout="topleft"
 			 left="9"
-			 top="192"
+			 top="204"
 			 height="20"
 			 label="Align"
 			 label_selected="Align current texture layers"
-- 
cgit v1.2.3


From a066c9a859bac941298368676356fe667a9f6501 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
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')

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 @@
     </floater.string>
     <floater.string
      name="status_selectcount">
-        [OBJ_COUNT] objects selected, land impact [LAND_IMPACT]
+        [OBJ_COUNT] objects selected, land impact [LAND_IMPACT] [secondlife:///app/openfloater/object_weights More info]
     </floater.string>
     <floater.string
      name="status_remaining_capacity">
@@ -763,11 +763,12 @@
 	  font="SansSerifSmall"
 	  layout="topleft"
 	  left="10"
-	  name="selection_count"
+	  name="selection_faces"
 	  top_delta="0"
 	  visible="false"
 	  width="280">
-	</text>
+    Faces selected: [FACES_STRING]
+  </text>
 	<text
 	 text_color="LtGray_50"
 	  type="string"
@@ -777,11 +778,10 @@
 	  font="SansSerifSmall"
 	  layout="topleft"
 	  left="10"
-	  name="remaining_capacity"
+	  name="selection_count"
 	  top_pad="0"
 	  visible="false"
 	  width="280">
-	  [CAPACITY_STRING] [secondlife:///app/openfloater/object_weights More info]
 	</text>
     <!-- <text -->
     <!-- text_color="LtGray_50" -->
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">
-       <on_click function="PanelVolume.menuDoToSelected" parameter="texture_copy" />
+       <on_click function="PanelFace.menuDoToSelected" parameter="texture_copy" />
     </menu_item_call>
     <menu_item_call
      label="Paste"
      layout="topleft"
      name="params_paste"
      visible="true">
-       <on_click function="PanelVolume.menuDoToSelected" parameter="texture_paste" />
-       <on_enable function="PanelVolume.menuEnable" parameter="texture_paste" />
+       <on_click function="PanelFace.menuDoToSelected" parameter="texture_paste" />
+       <on_enable function="PanelFace.menuEnable" parameter="texture_paste" />
     </menu_item_call>
 </toggleable_menu>
 
-- 
cgit v1.2.3


From 23f20c207d1e69c03e2ce2cb9100ad216ac60708 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
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')

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"/>
   </notification>
+  
+  <notification
+   icon="alertmodal.tga"
+   name="FacePasteFailed"
+   type="alertmodal">
+Paste failed. [REASON]
+   <usetemplate
+    name="okbutton"
+    yestext="OK"/>
+  </notification>
 
   <notification
    icon="alertmodal.tga"
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 611433bc1d..d7bccd3aea 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,15 @@
          name="Texture"
          top="0"
          width="295">
+            <panel.string
+             name="paste_error_face_selection_mismatch">
+              When multiple faces are copied, the target object must have the same number of faces selected.
+            </panel.string>
+            <panel.string
+             name="paste_error_object_face_count_mismatch">
+              When all faces of an object are copied, the target object must have the same number of faces.
+            </panel.string>
+
             <menu_button
              menu_filename="menu_copy_paste_color.xml"
              follows="top|left"
-- 
cgit v1.2.3


From f3216ca1cd6e63a254123635c18ba661297e8eef Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
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')

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"/>
   </notification>
-  
+
   <notification
    icon="alertmodal.tga"
    name="FacePasteFailed"
@@ -8957,6 +8957,19 @@ Paste failed. [REASON]
     yestext="OK"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="FacePasteTexturePermissions"
+   type="alertmodal">
+    You applied a texture with limited permissions, object will inherit permissions from texture.
+    <usetemplate
+     ignoretext="Paste: You applied a texture with limited permissions"
+     name="notifyignore"/>
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="ConfirmLeaveCall"
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 d7bccd3aea..a33d425964 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -19,6 +19,10 @@
              name="paste_error_object_face_count_mismatch">
               When all faces of an object are copied, the target object must have the same number of faces.
             </panel.string>
+            <panel.string
+             name="paste_error_inventory_not_found">
+              One or more texture not found in inventory.
+            </panel.string>
 
             <menu_button
              menu_filename="menu_copy_paste_color.xml"
-- 
cgit v1.2.3


From 2445525cc573024f8eb64cabac1e6e3dc3362085 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 19 Apr 2022 02:33:59 +0300
Subject: SL-17231 Copying textures should be disabled if object content was
 not yet updated

---
 indra/newview/skins/default/xui/en/panel_tools_texture.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/newview/skins')

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 a33d425964..0cbd7fe2dd 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -23,6 +23,10 @@
              name="paste_error_inventory_not_found">
               One or more texture not found in inventory.
             </panel.string>
+            <panel.string
+             name="paste_options">
+              Paste options
+            </panel.string>
 
             <menu_button
              menu_filename="menu_copy_paste_color.xml"
-- 
cgit v1.2.3


From dcac3f0514444684c57a97c6e01d32499da345d6 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 15 Jun 2022 17:53:22 +0300
Subject: SL-17577 Allow setting Object for sale for L$0 from Object Profile

---
 indra/newview/skins/default/xui/en/sidepanel_task_info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

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 8a3e18707f..1c9d750aa6 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -459,7 +459,7 @@
         label="Price: L$"
         label_width="73"				
         width="150"
-        min_val="1"
+        min_val="0"
         height="20"
         max_val="999999999"
         tool_tip="Object cost." />
-- 
cgit v1.2.3


From 48d2836ce6277f41c172ae5b68f2cb8845df7ad1 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 20 May 2022 23:19:26 +0300
Subject: SL-17436 Tools floater drops negative Z position for attachments

---
 indra/newview/skins/default/xui/en/floater_tools.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index f5214420b4..ade79b8884 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -1505,6 +1505,7 @@ even though the user gets a free copy.
              layout="topleft"
              left_delta="0"
              max_val="4096"
+             min_val="-32"
              name="Pos Z"
              text_enabled_color="0 0.8 1 .65"
              top_pad="3"
-- 
cgit v1.2.3


From 8488d8600905a8f5f8e80513e39a67dce7a8cc84 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 30 Jun 2022 13:22:19 +0300
Subject: SL-17668 Add operation "show in inventory" on in-world avatar
 attachment

---
 indra/newview/skins/default/xui/en/menu_attachment_self.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
index 26b1c86c53..3b91b9df7a 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -33,6 +33,13 @@
          function="Object.EnableTouch"
          name="EnableTouch"/>
     </menu_item_call>
+    <menu_item_call
+     label="Show in inventory"
+     layout="topleft"
+     name="Show original">
+      <menu_item_call.on_click
+       function="Object.ShowOriginal" />
+    </menu_item_call>
     <menu_item_separator
      layout="topleft" />
 
-- 
cgit v1.2.3


From ed9dbabb5e6e5f48492dc650ec2fd82317008b6f Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 4 Jul 2022 20:25:18 +0300
Subject: SL-17665 Add operation to create a subfolder from selected items in
 Inventory

---
 .../skins/default/xui/en/menu_inventory.xml        | 19 ++++++++++++
 .../newview/skins/default/xui/en/notifications.xml | 34 ++++++++++++++++++++++
 2 files changed, 53 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 78ca170813..aa3d0ae071 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -912,6 +912,25 @@
                 function="Inventory.DoToSelected"
                 parameter="apply_settings_parcel" />
     </menu_item_call>
+  <menu_item_separator
+   layout="topleft"
+   name="Subfolder Separator" />
+  <menu_item_call
+   label="Create folder from selected"
+   layout="topleft"
+   name="New folder from selected">
+    <menu_item_call.on_click
+     function="Inventory.DoToSelected"
+     parameter="new_folder_from_selected" />
+  </menu_item_call>
+  <menu_item_call
+   label="Ungroup folder items"
+   layout="topleft"
+   name="Ungroup folder items">
+    <menu_item_call.on_click
+     function="Inventory.DoToSelected"
+     parameter="ungroup_folder_items" />
+  </menu_item_call>
 	<menu_item_separator
 	 layout="topleft"
 	 name="Marketplace Separator" />
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 6a9039b198..0a3826123c 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11842,4 +11842,38 @@ Unpacking: [UNPACK_TIME]s [USIZE]KB
     </form>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   label="Save Outfit"
+   name="CreateSubfolder"
+   type="alertmodal">
+    <unique/>
+    Name the new folder:
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message" type="text">
+        [DESC]
+      </input>
+      <button
+       default="true"
+       index="0"
+       name="OK"
+       text="OK"/>
+      <button
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
+  <notification
+   icon="alertmodal.tga"
+   name="SameFolderRequired"
+   type="alert">
+    Selected items must be in the same folder.
+    <tag>fail</tag>
+    <usetemplate
+      name="okbutton"
+      yestext="OK"/>
+  </notification>
+
 </notifications>
-- 
cgit v1.2.3


From 59c586d0c635fc4fa308170fe5532dd2bb3f529b Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 7 Jul 2022 18:14:49 +0300
Subject: SL-17666 Allow Map sidebar UI to be hidden

---
 .../default/textures/map_ui_collapse_icon.png      | Bin 0 -> 300 bytes
 .../skins/default/textures/map_ui_expand_icon.png  | Bin 0 -> 284 bytes
 indra/newview/skins/default/textures/textures.xml  |   2 +
 .../skins/default/xui/en/floater_world_map.xml     |  90 +++++++++++++++++----
 4 files changed, 76 insertions(+), 16 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/map_ui_collapse_icon.png
 create mode 100644 indra/newview/skins/default/textures/map_ui_expand_icon.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/map_ui_collapse_icon.png b/indra/newview/skins/default/textures/map_ui_collapse_icon.png
new file mode 100644
index 0000000000..e4de49d4af
Binary files /dev/null and b/indra/newview/skins/default/textures/map_ui_collapse_icon.png differ
diff --git a/indra/newview/skins/default/textures/map_ui_expand_icon.png b/indra/newview/skins/default/textures/map_ui_expand_icon.png
new file mode 100644
index 0000000000..08734b4cc0
Binary files /dev/null and b/indra/newview/skins/default/textures/map_ui_expand_icon.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index a5ebfb3395..e9ef888a7f 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -810,6 +810,8 @@ with the same filename but different name
   <texture name="map_infohub.tga" />
   <texture name="map_telehub.tga" />
   <texture name="map_track_16.tga" />
+  <texture name="map_ui_collapse_icon.png" />
+  <texture name="map_ui_expand_icon.png" />
 
   <texture name="notify_caution_icon.tga" />
 
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index 83407069d2..45e11fc836 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -14,6 +14,31 @@
  single_instance="true"
  title="WORLD MAP"
  width="650">
+  <string
+   name="collapse_icon"
+   value="map_ui_collapse_icon.png"/>
+  <string
+   name="expand_icon"
+   value="map_ui_expand_icon.png"/>
+  <string
+   name="collapse_tooltip"
+   value="Hide map controls"/>
+  <string
+   name="expand_tooltip"
+   value="Show map controls"/>
+  <layout_stack
+   animate="false"
+   follows="all"
+   name="floater_map_stack"
+   tab_group="1"
+   top="16"
+   left="0"
+   right="-1"
+   bottom="-1">
+    <layout_panel
+     name="map_lp"
+     width="385"
+     height="575">
     <panel
      filename="panel_world_map.xml"
      follows="all"
@@ -21,17 +46,48 @@
      layout="topleft"
      left="10"
      name="objects_mapview"
-     top="25"
+     top="6"
      width="375" />
+      <panel
+       follows="top|right"
+       height="30"
+       layout="topleft"
+       left_pad="-29"
+       name="expand_btn_panel"
+       background_visible="true"
+       bg_opaque_color="FloaterFocusBackgroundColor"
+       bg_alpha_color="FloaterDefaultBackgroundColor"
+       background_opaque="true"
+       tool_tip="Hide map controls"
+       top="350"
+       width="30">
+        <icon
+         follows="top|right"
+         height="16"
+         width="16"
+         top="7"
+         left="7"
+         scale_image="false"
+         image_name="map_ui_collapse_icon.png"
+         layout="topleft"
+         mouse_opaque="true"
+         name="expand_collapse_icon"
+         tool_tip="Hide map controls" />
+      </panel>
+      </layout_panel>
+    <layout_panel
+      height="575"
+      width="265"
+      expanded_min_dim="265"
+      name="controls_lp">
      <panel
-     name="layout_panel_1"
-     height="22"
-     width="238"
-     follows="right|top"
-     top="25"
-     left_pad="5"
-  background_visible="true"
-  bg_alpha_color="DkGray2">
+      name="layout_panel_1"
+      height="22"
+      width="238"
+      follows="right|top"
+      top="6"     
+      background_visible="true"
+      bg_alpha_color="DkGray2">
     <text
      text_color="White"
      font="SansSerifLarge"
@@ -43,17 +99,17 @@
      layout="topleft"
      left="15"
      name="events_label"
-     top="3"
      width="215">
         Legend
     </text>
     </panel>
-<panel
- follows="right|top"
-  height="126"
-  top_pad="0"
-  width="238"
-  name="layout_panel_2">
+    <panel
+     follows="right|top"
+     height="126"
+     top_pad="4"
+     width="238"
+     left="1"
+     name="layout_panel_2">
 <button
      follows="right|top"
      height="22"
@@ -690,4 +746,6 @@
      show_text="false"
      width="200" />
      </panel>
+      </layout_panel>
+    </layout_stack>
 </floater>
-- 
cgit v1.2.3


From caa5b92fb77f55360032a3dac10385c84b457cbf Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 11 Jul 2022 16:46:19 +0300
Subject: SL-17665 additional checks to avoid moving protected folders

---
 indra/newview/skins/default/xui/en/notifications.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 0a3826123c..1ee0d9c64a 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11663,7 +11663,7 @@ This Region does not support environmental settings.
  
   <notification
    icon="alertmodal.tga"
-   label="Save Outfit"
+   label="Save Environmental Settings"
    name="SaveSettingAs"
    type="alertmodal">
     <unique/>
@@ -11844,7 +11844,7 @@ Unpacking: [UNPACK_TIME]s [USIZE]KB
 
   <notification
    icon="alertmodal.tga"
-   label="Save Outfit"
+   label="Create subfolder"
    name="CreateSubfolder"
    type="alertmodal">
     <unique/>
-- 
cgit v1.2.3