Added Copy/Paste to object properties in Build Tools

3 files changed, 109 insertions, 18 deletions

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
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Paste.png
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"