diff options
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/textures/icons/Paste.png | bin | 0 -> 530 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_tools.xml | 149 |
3 files changed, 131 insertions, 19 deletions
diff --git a/indra/newview/skins/default/textures/icons/Paste.png b/indra/newview/skins/default/textures/icons/Paste.png Binary files differnew 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 0abee2ff80..bbb978a631 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -1456,6 +1456,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" @@ -1464,13 +1479,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" @@ -1479,7 +1509,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" @@ -1512,6 +1542,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" @@ -1520,13 +1565,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" @@ -1535,7 +1595,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" @@ -1570,6 +1630,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" @@ -1579,13 +1654,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" @@ -1595,7 +1685,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" @@ -1608,18 +1698,39 @@ 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"> 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" - left="125" + top_pad="5" + left="135" width="150"> <combo_box.item label="Box" @@ -1698,7 +1809,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"> @@ -1722,7 +1833,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" @@ -1746,7 +1857,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"> @@ -1824,7 +1935,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"> @@ -1877,7 +1988,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"> @@ -1920,7 +2031,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"> @@ -1984,7 +2095,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"> @@ -2027,7 +2138,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"> @@ -2052,7 +2163,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" @@ -2077,7 +2188,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" |
