summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorKadah_Coba <kadah.coba@gmail.com>2019-10-14 20:35:44 -0700
committerKadah_Coba <kadah.coba@gmail.com>2019-10-14 20:35:44 -0700
commit1e1707d532560583744bb877adfed11864f2db31 (patch)
tree75af0c48a490a799532748ae2d4fe63be48facfd /indra/newview/skins/default
parentce48cb4303c10dbc9d3044271035153569226040 (diff)
[Project Copy/Paste] Texture support
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/menu_texture_paste.xml70
-rw-r--r--indra/newview/skins/default/xui/en/panel_tools_texture.xml55
2 files changed, 115 insertions, 10 deletions
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"