Henri Beauchamp: Port of SG-2.0 alpha and tattoo layers (v6)

slviewer-0-v12350-AlphaAndTattooSupport-patch.zip contains the necessary avatar_lad.xml and other artwork. The new avatar_lad.xml crashes clients without alpha and tattoo support at startup.
author: Armin Weatherwax 2010-03-09 23:00:38 +0100
committer: Jacek Antonelli 2010-06-19 02:43:01 -0500
commit: 523e0e2dff6af1c5bc12e2aefc0ca9b96bf26fd6 (patch)
tree: efc2b1bf0b7ca57b4fcc5e64da555907437a408d /linden/indra/newview/skins/default/xui
parent: Applied patch by Kirstenlee Cinquetti for SNOW-493: LLDataPackerBinaryBuffer:... (diff)
download: meta-impy-523e0e2dff6af1c5bc12e2aefc0ca9b96bf26fd6.zip
meta-impy-523e0e2dff6af1c5bc12e2aefc0ca9b96bf26fd6.tar.gz
meta-impy-523e0e2dff6af1c5bc12e2aefc0ca9b96bf26fd6.tar.bz2
meta-impy-523e0e2dff6af1c5bc12e2aefc0ca9b96bf26fd6.tar.xz
4 files changed, 192 insertions, 2 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml b/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml
index e947ecd..a0dd938 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml
@@ -1108,6 +1108,174 @@ scratch and wear it.
                             height="20" label="Revert" label_selected="Revert" left="305"
                             mouse_opaque="true" name="Revert" scale_image="true" width="82" />
                </panel>
+                <panel name="Tattoo" label="Tattoo" border="true" mouse_opaque="true"
+             follows="left|top|right|bottom" width="389" height="481" left="102" bottom="-482">
+                        <icon bottom="-21" color="1 1 1 1" follows="top|right" height="16"
+                             image_name="icon_lock.tga" left="333" mouse_opaque="true" name="square"
+                             width="16" />
+                        <icon bottom="-24" color="1 1 1 1" follows="left|top" height="16" left="8"
+                             mouse_opaque="true" name="icon" width="16" />
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-24" drop_shadow_visible="true" follows="left|top|right"
+                             font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+                             mouse_opaque="true" name="title" v_pad="0" width="355">
+                                [DESC]
+                        </text>
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-24" drop_shadow_visible="true" follows="left|top|right"
+                             font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+                             mouse_opaque="true" name="title_no_modify" v_pad="0" width="355">
+                                [DESC]: cannot modify
+                        </text>
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-24" drop_shadow_visible="true" follows="left|top|right"
+                             font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+                             mouse_opaque="true" name="title_loading" v_pad="0" width="355">
+                                [DESC]: loading...
+                        </text>
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-24" drop_shadow_visible="true" follows="left|top|right"
+                             font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+                             mouse_opaque="true" name="title_not_worn" v_pad="0" width="355">
+                                [DESC]: not worn
+                        </text>
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-38" drop_shadow_visible="true" follows="left|top|right"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="14" left="8"
+                             mouse_opaque="true" name="path" v_pad="0" width="373">
+                                Located in [PATH]
+                        </text>
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-74" drop_shadow_visible="true" follows="left|top|right"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
+                             mouse_opaque="true" name="not worn instructions" v_pad="0" width="373">
+                Put on a new tattoo by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
+                        </text>
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-74" drop_shadow_visible="true" follows="left|top|right"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
+                             mouse_opaque="true" name="no modify instructions" v_pad="0" width="373">
+                                You do not have permission to modify this wearable.
+                        </text>
+            <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom="-486" drop_shadow_visible="true" follows="left|top|right"
+                 font="SansSerif" h_pad="0" halign="right" height="28" right="117"
+                 mouse_opaque="true" name="Item Action Label" v_pad="0" width="100">
+                Tattoo:
+            </text>
+            <texture_picker  name="Head Tattoo" label="Head Tattoo" tool_tip="Click to choose a picture"
+             can_apply_immediately="true" default_image_name="Default" allow_no_texture="true"
+             follows="left|top" width="70" height="80" left="14" bottom="-145"/>
+            <texture_picker name="Upper Tattoo" label="Upper Tattoo" tool_tip="Click to choose a picture"
+             can_apply_immediately="true" default_image_name="Default" allow_no_texture="true"
+             follows="left|top" width="70" height="80" left="14" bottom="-235"/>
+            <texture_picker name="Lower Tattoo" label="Lower Tattoo" tool_tip="Click to choose a picture"
+             can_apply_immediately="true" default_image_name="Default" allow_no_texture="true"
+             follows="left|top" width="70" height="80" left="14" bottom="-325"/>
+                        <button name="Create New" label="Create New Tattoo" label_selected="Create New Tattoo"
+                 follows="left|top" halign="center" width="170" height="24" left="8" bottom="-128"
+                             mouse_opaque="true" scale_image="true"/>
+            <button name="Take Off" label="Take Off" label_selected="Take Off"
+             follows="left|top" width="82" height="20" left="8" bottom="-365"/>
+            <button name="Save" label="Save" label_selected="Save"
+             follows="right|bottom" width="82" height="20" left="123" bottom="-478"/>
+            <button name="Save As" label="Save As..." label_selected="Save As..."
+             follows="right|bottom" width="92" height="20" left="209" bottom="-478"/>
+            <button name="Revert" label="Revert" label_selected="Revert"
+             follows="right|bottom" width="82" height="20" left="305" bottom="-478"/>
+                </panel>
+                <panel name="Alpha" label="Alpha" border="true" mouse_opaque="true"
+             follows="left|top|right|bottom" width="389" height="481" left="102" bottom="-482">
+                        <icon bottom="-21" color="1 1 1 1" follows="top|right" height="16"
+                             image_name="icon_lock.tga" left="333" mouse_opaque="true" name="square"
+                             width="16" />
+                        <icon bottom="-24" color="1 1 1 1" follows="left|top" height="16" left="8"
+                             mouse_opaque="true" name="icon" width="16" />
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-24" drop_shadow_visible="true" follows="left|top|right"
+                             font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+                             mouse_opaque="true" name="title" v_pad="0" width="355">
+                                [DESC]
+                        </text>
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-24" drop_shadow_visible="true" follows="left|top|right"
+                             font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+                             mouse_opaque="true" name="title_no_modify" v_pad="0" width="355">
+                                [DESC]: cannot modify
+                        </text>
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-24" drop_shadow_visible="true" follows="left|top|right"
+                             font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+                             mouse_opaque="true" name="title_loading" v_pad="0" width="355">
+                                [DESC]: loading...
+                        </text>
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-24" drop_shadow_visible="true" follows="left|top|right"
+                             font="SansSerif" h_pad="0" halign="left" height="16" left="26"
+                             mouse_opaque="true" name="title_not_worn" v_pad="0" width="355">
+                                [DESC]: not worn
+                        </text>
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-38" drop_shadow_visible="true" follows="left|top|right"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="14" left="8"
+                             mouse_opaque="true" name="path" v_pad="0" width="373">
+                                Located in [PATH]
+                        </text>
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-74" drop_shadow_visible="true" follows="left|top|right"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
+                             mouse_opaque="true" name="not worn instructions" v_pad="0" width="373">
+                Put on a new alpha mask by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
+                        </text>
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-74" drop_shadow_visible="true" follows="left|top|right"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
+                             mouse_opaque="true" name="no modify instructions" v_pad="0" width="373">
+                                You do not have permission to modify this wearable.
+                        </text>
+            <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom="-486" drop_shadow_visible="true" follows="left|top|right"
+                 font="SansSerif" h_pad="0" halign="right" height="28" right="117"
+                 mouse_opaque="true" name="Item Action Label" v_pad="0" width="100">
+                Alpha:
+            </text>
+            <texture_picker name="Head Alpha" label="Head Alpha" tool_tip="Click to choose a picture"
+             can_apply_immediately="true" default_image_name="Default" allow_no_texture="true"
+             follows="left|top" width="64" height="80" left="120" bottom="-165"/>
+            <texture_picker name="Upper Alpha" label="Upper Alpha" tool_tip="Click to choose a picture"
+             can_apply_immediately="true" default_image_name="Default" allow_no_texture="true"
+             follows="left|top" width="64" height="80" left_delta="90" bottom="-165"/>
+            <texture_picker  name="Lower Alpha" label="Lower Alpha" tool_tip="Click to choose a picture"
+             can_apply_immediately="true" default_image_name="Default" allow_no_texture="true"
+             follows="left|top" width="64" height="80" left_delta="90" bottom="-165"/>
+            <check_box name="head alpha texture invisible"
+             follows="left" width="16" height="16" left="142" bottom="-185"/>
+            <check_box name="upper alpha texture invisible"
+             follows="left" width="16" height="16" left_delta="90" bottom="-185"/>
+            <check_box name="lower alpha texture invisible"
+             follows="left" width="16" height="16" left_delta="90" bottom="-185"/>
+            <texture_picker name="Hair Alpha" label="Hair Alpha" tool_tip="Click to choose a picture"
+             can_apply_immediately="true" default_image_name="Default" allow_no_texture="true"
+             follows="left|top" width="64" height="80" left="120" bottom="-280"/>
+            <texture_picker name="Eye Alpha" label="Eye Alpha" tool_tip="Click to choose a picture"
+             can_apply_immediately="true" default_image_name="Default" allow_no_texture="true"
+             follows="left|top" width="64" height="80" left_delta="90" bottom="-280"/>
+            <check_box name="hair alpha texture invisible"
+             follows="left" width="16" height="16" left="142" bottom="-300"/>
+            <check_box name="eye alpha texture invisible"
+             follows="left" width="16" height="16" left_delta="90" bottom="-300"/>
+                        <button name="Create New" label="Create New Alpha" label_selected="Create New Alpha"
+                 follows="left|top" halign="center" width="170" height="24" left="8" bottom="-128"
+                             mouse_opaque="true" scale_image="true"/>
+            <button name="Take Off" label="Take Off" label_selected="Take Off"
+             follows="left|top" width="82" height="20" left="123" bottom="-340"/>
+            <button name="Save" label="Save" label_selected="Save"
+             follows="right|bottom" width="82" height="20" left="123" bottom="-478"/>
+            <button name="Save As" label="Save As..." label_selected="Save As..."
+             follows="right|bottom" width="92" height="20" left="209" bottom="-478"/>
+            <button name="Revert" label="Revert" label_selected="Revert"
+             follows="right|bottom" width="82" height="20" left="305" bottom="-478"/>
+                </panel>
        </tab_container>
        <scroll_container bottom="-476" follows="left|top|right|bottom" height="382" left="197"
             mouse_opaque="false" name="panel_container" opaque="false" width="292" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
index 103a11e..f1a6626 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
@@ -160,6 +160,14 @@
                                     mouse_opaque="true" name="New Underpants" width="125">
                                        <on_click filter="" function="Inventory.DoCreate" userdata="underpants" />
                                </menu_item_call>
+                                <menu_item_call bottom_delta="-18" height="18" label="New Tattoo" left="0"
+                                     mouse_opaque="true" name="New Tattoo" width="125">
+                                        <on_click filter="" function="Inventory.DoCreate" userdata="tattoo" />
+                                </menu_item_call>
+                                <menu_item_call bottom_delta="-18" height="18" label="New Alpha" left="0"
+                                     mouse_opaque="true" name="New Alpha" width="125">
+                                        <on_click filter="" function="Inventory.DoCreate" userdata="alpha" />
+                                </menu_item_call>
                        </menu>
                        <menu bottom_delta="-599" drop_shadow="true" height="85" left="0"
                             mouse_opaque="false" name="New Body Parts" opaque="true" width="118">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml b/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml
index 27a08c1..51cd2f5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml
@@ -21,7 +21,7 @@
        <check_box bottom="-276" enabled="true" follows="left|top" font="SansSerifSmall"
             height="16" initial_value="false" label="Eyes" left="13"
             mouse_opaque="true" name="checkbox_Eyes" radio_style="false" width="100" />
-        <check_box bottom="-434" enabled="true" follows="left|top" font="SansSerifSmall"
+        <check_box bottom="-456" enabled="true" follows="left|top" font="SansSerifSmall"
             height="16" initial_value="false" label="Rename Clothing To Folder Name"
             left="13" mouse_opaque="true" name="rename" radio_style="false" width="210" />
        <check_box bottom="-216" enabled="true" follows="left|top" font="SansSerifSmall"
@@ -53,6 +53,12 @@
        <check_box bottom="-376" enabled="true" follows="left|top" font="SansSerifSmall"
             height="16" initial_value="false" label="Skirt" left="113"
             mouse_opaque="true" name="checkbox_Skirt" radio_style="false" width="100" />
+        <check_box bottom="-396" enabled="true" follows="left|top" font="SansSerifSmall"
+             height="16" initial_value="false" label="Tattoo" left="113"
+             mouse_opaque="true" name="checkbox_Tattoo" radio_style="false" width="100" />
+        <check_box bottom="-416" enabled="true" follows="left|top" font="SansSerifSmall"
+             height="16" initial_value="false" label="Alpha" left="113"
+             mouse_opaque="true" name="checkbox_Alpha" radio_style="false" width="100" />
        <check_box bottom="-216" enabled="false" follows="left|top" font="SansSerifSmall"
             height="16" initial_value="false" label="Chest" left="213"
             mouse_opaque="true" name="checkbox_Chest" radio_style="false" width="100" />
@@ -250,7 +256,7 @@ now wearing into it.
                Attachments:
        </text>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-414" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-436" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
             mouse_opaque="true" name="Options:" v_pad="0" width="100">
                Options:
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
index e50d02d..ad43c9d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
@@ -88,6 +88,14 @@
                     mouse_opaque="true" name="New Underpants" width="128">
                        <on_click filter="" function="Inventory.DoCreate" userdata="underpants" />
                </menu_item_call>
+                <menu_item_call bottom_delta="-18" height="18" label="New Tattoo" left="0"
+                     mouse_opaque="true" name="New Tattoo" width="128">
+                        <on_click filter="" function="Inventory.DoCreate" userdata="tattoo" />
+                </menu_item_call>
+                <menu_item_call bottom_delta="-18" height="18" label="New Alpha" left="0"
+                     mouse_opaque="true" name="New Alpha" width="128">
+                        <on_click filter="" function="Inventory.DoCreate" userdata="alpha" />
+                </menu_item_call>
        </menu>
        <menu bottom_delta="0" color="MenuDefaultBgColor" drop_shadow="true" height="175" left="0"
             mouse_opaque="false" name="New Body Parts" opaque="true" tear_off="false"
author	Armin Weatherwax	2010-03-09 23:00:38 +0100
committer	Jacek Antonelli	2010-06-19 02:43:01 -0500
commit	523e0e2dff6af1c5bc12e2aefc0ca9b96bf26fd6 (patch)
tree	efc2b1bf0b7ca57b4fcc5e64da555907437a408d /linden/indra/newview/skins/default/xui
parent	Applied patch by Kirstenlee Cinquetti for SNOW-493: LLDataPackerBinaryBuffer:... (diff)
download	meta-impy-523e0e2dff6af1c5bc12e2aefc0ca9b96bf26fd6.zip meta-impy-523e0e2dff6af1c5bc12e2aefc0ca9b96bf26fd6.tar.gz meta-impy-523e0e2dff6af1c5bc12e2aefc0ca9b96bf26fd6.tar.bz2 meta-impy-523e0e2dff6af1c5bc12e2aefc0ca9b96bf26fd6.tar.xz

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml b/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml index e947ecd..a0dd938 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml
@@ -1108,6 +1108,174 @@ scratch and wear it.
1108	height="20" label="Revert" label_selected="Revert" left="305"	1108	height="20" label="Revert" label_selected="Revert" left="305"
1109	mouse_opaque="true" name="Revert" scale_image="true" width="82" />	1109	mouse_opaque="true" name="Revert" scale_image="true" width="82" />
1110	</panel>	1110	</panel>
		1111	<panel name="Tattoo" label="Tattoo" border="true" mouse_opaque="true"
		1112	follows="left\|top\|right\|bottom" width="389" height="481" left="102" bottom="-482">
		1113	<icon bottom="-21" color="1 1 1 1" follows="top\|right" height="16"
		1114	image_name="icon_lock.tga" left="333" mouse_opaque="true" name="square"
		1115	width="16" />
		1116	<icon bottom="-24" color="1 1 1 1" follows="left\|top" height="16" left="8"
		1117	mouse_opaque="true" name="icon" width="16" />
		1118	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
		1119	bottom="-24" drop_shadow_visible="true" follows="left\|top\|right"
		1120	font="SansSerif" h_pad="0" halign="left" height="16" left="26"
		1121	mouse_opaque="true" name="title" v_pad="0" width="355">
		1122	[DESC]
		1123	</text>
		1124	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
		1125	bottom="-24" drop_shadow_visible="true" follows="left\|top\|right"
		1126	font="SansSerif" h_pad="0" halign="left" height="16" left="26"
		1127	mouse_opaque="true" name="title_no_modify" v_pad="0" width="355">
		1128	[DESC]: cannot modify
		1129	</text>
		1130	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
		1131	bottom="-24" drop_shadow_visible="true" follows="left\|top\|right"
		1132	font="SansSerif" h_pad="0" halign="left" height="16" left="26"
		1133	mouse_opaque="true" name="title_loading" v_pad="0" width="355">
		1134	[DESC]: loading...
		1135	</text>
		1136	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
		1137	bottom="-24" drop_shadow_visible="true" follows="left\|top\|right"
		1138	font="SansSerif" h_pad="0" halign="left" height="16" left="26"
		1139	mouse_opaque="true" name="title_not_worn" v_pad="0" width="355">
		1140	[DESC]: not worn
		1141	</text>
		1142	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
		1143	bottom="-38" drop_shadow_visible="true" follows="left\|top\|right"
		1144	font="SansSerifSmall" h_pad="0" halign="left" height="14" left="8"
		1145	mouse_opaque="true" name="path" v_pad="0" width="373">
		1146	Located in [PATH]
		1147	</text>
		1148	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
		1149	bottom="-74" drop_shadow_visible="true" follows="left\|top\|right"
		1150	font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
		1151	mouse_opaque="true" name="not worn instructions" v_pad="0" width="373">
		1152	Put on a new tattoo by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
		1153	</text>
		1154	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
		1155	bottom="-74" drop_shadow_visible="true" follows="left\|top\|right"
		1156	font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
		1157	mouse_opaque="true" name="no modify instructions" v_pad="0" width="373">
		1158	You do not have permission to modify this wearable.
		1159	</text>
		1160	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
		1161	bottom="-486" drop_shadow_visible="true" follows="left\|top\|right"
		1162	font="SansSerif" h_pad="0" halign="right" height="28" right="117"
		1163	mouse_opaque="true" name="Item Action Label" v_pad="0" width="100">
		1164	Tattoo:
		1165	</text>
		1166	<texture_picker name="Head Tattoo" label="Head Tattoo" tool_tip="Click to choose a picture"
		1167	can_apply_immediately="true" default_image_name="Default" allow_no_texture="true"
		1168	follows="left\|top" width="70" height="80" left="14" bottom="-145"/>
		1169	<texture_picker name="Upper Tattoo" label="Upper Tattoo" tool_tip="Click to choose a picture"
		1170	can_apply_immediately="true" default_image_name="Default" allow_no_texture="true"
		1171	follows="left\|top" width="70" height="80" left="14" bottom="-235"/>
		1172	<texture_picker name="Lower Tattoo" label="Lower Tattoo" tool_tip="Click to choose a picture"
		1173	can_apply_immediately="true" default_image_name="Default" allow_no_texture="true"
		1174	follows="left\|top" width="70" height="80" left="14" bottom="-325"/>
		1175	<button name="Create New" label="Create New Tattoo" label_selected="Create New Tattoo"
		1176	follows="left\|top" halign="center" width="170" height="24" left="8" bottom="-128"
		1177	mouse_opaque="true" scale_image="true"/>
		1178	<button name="Take Off" label="Take Off" label_selected="Take Off"
		1179	follows="left\|top" width="82" height="20" left="8" bottom="-365"/>
		1180	<button name="Save" label="Save" label_selected="Save"
		1181	follows="right\|bottom" width="82" height="20" left="123" bottom="-478"/>
		1182	<button name="Save As" label="Save As..." label_selected="Save As..."
		1183	follows="right\|bottom" width="92" height="20" left="209" bottom="-478"/>
		1184	<button name="Revert" label="Revert" label_selected="Revert"
		1185	follows="right\|bottom" width="82" height="20" left="305" bottom="-478"/>
		1186	</panel>
		1187	<panel name="Alpha" label="Alpha" border="true" mouse_opaque="true"
		1188	follows="left\|top\|right\|bottom" width="389" height="481" left="102" bottom="-482">
		1189	<icon bottom="-21" color="1 1 1 1" follows="top\|right" height="16"
		1190	image_name="icon_lock.tga" left="333" mouse_opaque="true" name="square"
		1191	width="16" />
		1192	<icon bottom="-24" color="1 1 1 1" follows="left\|top" height="16" left="8"
		1193	mouse_opaque="true" name="icon" width="16" />
		1194	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
		1195	bottom="-24" drop_shadow_visible="true" follows="left\|top\|right"
		1196	font="SansSerif" h_pad="0" halign="left" height="16" left="26"
		1197	mouse_opaque="true" name="title" v_pad="0" width="355">
		1198	[DESC]
		1199	</text>
		1200	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
		1201	bottom="-24" drop_shadow_visible="true" follows="left\|top\|right"
		1202	font="SansSerif" h_pad="0" halign="left" height="16" left="26"
		1203	mouse_opaque="true" name="title_no_modify" v_pad="0" width="355">
		1204	[DESC]: cannot modify
		1205	</text>
		1206	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
		1207	bottom="-24" drop_shadow_visible="true" follows="left\|top\|right"
		1208	font="SansSerif" h_pad="0" halign="left" height="16" left="26"
		1209	mouse_opaque="true" name="title_loading" v_pad="0" width="355">
		1210	[DESC]: loading...
		1211	</text>
		1212	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
		1213	bottom="-24" drop_shadow_visible="true" follows="left\|top\|right"
		1214	font="SansSerif" h_pad="0" halign="left" height="16" left="26"
		1215	mouse_opaque="true" name="title_not_worn" v_pad="0" width="355">
		1216	[DESC]: not worn
		1217	</text>
		1218	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
		1219	bottom="-38" drop_shadow_visible="true" follows="left\|top\|right"
		1220	font="SansSerifSmall" h_pad="0" halign="left" height="14" left="8"
		1221	mouse_opaque="true" name="path" v_pad="0" width="373">
		1222	Located in [PATH]
		1223	</text>
		1224	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
		1225	bottom="-74" drop_shadow_visible="true" follows="left\|top\|right"
		1226	font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
		1227	mouse_opaque="true" name="not worn instructions" v_pad="0" width="373">
		1228	Put on a new alpha mask by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
		1229	</text>
		1230	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
		1231	bottom="-74" drop_shadow_visible="true" follows="left\|top\|right"
		1232	font="SansSerifSmall" h_pad="0" halign="left" height="28" left="8"
		1233	mouse_opaque="true" name="no modify instructions" v_pad="0" width="373">
		1234	You do not have permission to modify this wearable.
		1235	</text>
		1236	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
		1237	bottom="-486" drop_shadow_visible="true" follows="left\|top\|right"
		1238	font="SansSerif" h_pad="0" halign="right" height="28" right="117"
		1239	mouse_opaque="true" name="Item Action Label" v_pad="0" width="100">
		1240	Alpha:
		1241	</text>
		1242	<texture_picker name="Head Alpha" label="Head Alpha" tool_tip="Click to choose a picture"
		1243	can_apply_immediately="true" default_image_name="Default" allow_no_texture="true"
		1244	follows="left\|top" width="64" height="80" left="120" bottom="-165"/>
		1245	<texture_picker name="Upper Alpha" label="Upper Alpha" tool_tip="Click to choose a picture"
		1246	can_apply_immediately="true" default_image_name="Default" allow_no_texture="true"
		1247	follows="left\|top" width="64" height="80" left_delta="90" bottom="-165"/>
		1248	<texture_picker name="Lower Alpha" label="Lower Alpha" tool_tip="Click to choose a picture"
		1249	can_apply_immediately="true" default_image_name="Default" allow_no_texture="true"
		1250	follows="left\|top" width="64" height="80" left_delta="90" bottom="-165"/>
		1251	<check_box name="head alpha texture invisible"
		1252	follows="left" width="16" height="16" left="142" bottom="-185"/>
		1253	<check_box name="upper alpha texture invisible"
		1254	follows="left" width="16" height="16" left_delta="90" bottom="-185"/>
		1255	<check_box name="lower alpha texture invisible"
		1256	follows="left" width="16" height="16" left_delta="90" bottom="-185"/>
		1257	<texture_picker name="Hair Alpha" label="Hair Alpha" tool_tip="Click to choose a picture"
		1258	can_apply_immediately="true" default_image_name="Default" allow_no_texture="true"
		1259	follows="left\|top" width="64" height="80" left="120" bottom="-280"/>
		1260	<texture_picker name="Eye Alpha" label="Eye Alpha" tool_tip="Click to choose a picture"
		1261	can_apply_immediately="true" default_image_name="Default" allow_no_texture="true"
		1262	follows="left\|top" width="64" height="80" left_delta="90" bottom="-280"/>
		1263	<check_box name="hair alpha texture invisible"
		1264	follows="left" width="16" height="16" left="142" bottom="-300"/>
		1265	<check_box name="eye alpha texture invisible"
		1266	follows="left" width="16" height="16" left_delta="90" bottom="-300"/>
		1267	<button name="Create New" label="Create New Alpha" label_selected="Create New Alpha"
		1268	follows="left\|top" halign="center" width="170" height="24" left="8" bottom="-128"
		1269	mouse_opaque="true" scale_image="true"/>
		1270	<button name="Take Off" label="Take Off" label_selected="Take Off"
		1271	follows="left\|top" width="82" height="20" left="123" bottom="-340"/>
		1272	<button name="Save" label="Save" label_selected="Save"
		1273	follows="right\|bottom" width="82" height="20" left="123" bottom="-478"/>
		1274	<button name="Save As" label="Save As..." label_selected="Save As..."
		1275	follows="right\|bottom" width="92" height="20" left="209" bottom="-478"/>
		1276	<button name="Revert" label="Revert" label_selected="Revert"
		1277	follows="right\|bottom" width="82" height="20" left="305" bottom="-478"/>
		1278	</panel>
1111	</tab_container>	1279	</tab_container>
1112	<scroll_container bottom="-476" follows="left\|top\|right\|bottom" height="382" left="197"	1280	<scroll_container bottom="-476" follows="left\|top\|right\|bottom" height="382" left="197"
1113	mouse_opaque="false" name="panel_container" opaque="false" width="292" />	1281	mouse_opaque="false" name="panel_container" opaque="false" width="292" />


diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml index 103a11e..f1a6626 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
@@ -160,6 +160,14 @@
160	mouse_opaque="true" name="New Underpants" width="125">	160	mouse_opaque="true" name="New Underpants" width="125">
161	<on_click filter="" function="Inventory.DoCreate" userdata="underpants" />	161	<on_click filter="" function="Inventory.DoCreate" userdata="underpants" />
162	</menu_item_call>	162	</menu_item_call>
		163	<menu_item_call bottom_delta="-18" height="18" label="New Tattoo" left="0"
		164	mouse_opaque="true" name="New Tattoo" width="125">
		165	<on_click filter="" function="Inventory.DoCreate" userdata="tattoo" />
		166	</menu_item_call>
		167	<menu_item_call bottom_delta="-18" height="18" label="New Alpha" left="0"
		168	mouse_opaque="true" name="New Alpha" width="125">
		169	<on_click filter="" function="Inventory.DoCreate" userdata="alpha" />
		170	</menu_item_call>
163	</menu>	171	</menu>
164	<menu bottom_delta="-599" drop_shadow="true" height="85" left="0"	172	<menu bottom_delta="-599" drop_shadow="true" height="85" left="0"
165	mouse_opaque="false" name="New Body Parts" opaque="true" width="118">	173	mouse_opaque="false" name="New Body Parts" opaque="true" width="118">


diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml b/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml index 27a08c1..51cd2f5 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml
@@ -21,7 +21,7 @@
21	<check_box bottom="-276" enabled="true" follows="left\|top" font="SansSerifSmall"	21	<check_box bottom="-276" enabled="true" follows="left\|top" font="SansSerifSmall"
22	height="16" initial_value="false" label="Eyes" left="13"	22	height="16" initial_value="false" label="Eyes" left="13"
23	mouse_opaque="true" name="checkbox_Eyes" radio_style="false" width="100" />	23	mouse_opaque="true" name="checkbox_Eyes" radio_style="false" width="100" />
24	<check_box bottom="-434" enabled="true" follows="left\|top" font="SansSerifSmall"	24	<check_box bottom="-456" enabled="true" follows="left\|top" font="SansSerifSmall"
25	height="16" initial_value="false" label="Rename Clothing To Folder Name"	25	height="16" initial_value="false" label="Rename Clothing To Folder Name"
26	left="13" mouse_opaque="true" name="rename" radio_style="false" width="210" />	26	left="13" mouse_opaque="true" name="rename" radio_style="false" width="210" />
27	<check_box bottom="-216" enabled="true" follows="left\|top" font="SansSerifSmall"	27	<check_box bottom="-216" enabled="true" follows="left\|top" font="SansSerifSmall"
@@ -53,6 +53,12 @@
53	<check_box bottom="-376" enabled="true" follows="left\|top" font="SansSerifSmall"	53	<check_box bottom="-376" enabled="true" follows="left\|top" font="SansSerifSmall"
54	height="16" initial_value="false" label="Skirt" left="113"	54	height="16" initial_value="false" label="Skirt" left="113"
55	mouse_opaque="true" name="checkbox_Skirt" radio_style="false" width="100" />	55	mouse_opaque="true" name="checkbox_Skirt" radio_style="false" width="100" />
		56	<check_box bottom="-396" enabled="true" follows="left\|top" font="SansSerifSmall"
		57	height="16" initial_value="false" label="Tattoo" left="113"
		58	mouse_opaque="true" name="checkbox_Tattoo" radio_style="false" width="100" />
		59	<check_box bottom="-416" enabled="true" follows="left\|top" font="SansSerifSmall"
		60	height="16" initial_value="false" label="Alpha" left="113"
		61	mouse_opaque="true" name="checkbox_Alpha" radio_style="false" width="100" />
56	<check_box bottom="-216" enabled="false" follows="left\|top" font="SansSerifSmall"	62	<check_box bottom="-216" enabled="false" follows="left\|top" font="SansSerifSmall"
57	height="16" initial_value="false" label="Chest" left="213"	63	height="16" initial_value="false" label="Chest" left="213"
58	mouse_opaque="true" name="checkbox_Chest" radio_style="false" width="100" />	64	mouse_opaque="true" name="checkbox_Chest" radio_style="false" width="100" />
@@ -250,7 +256,7 @@ now wearing into it.
250	Attachments:	256	Attachments:
251	</text>	257	</text>
252	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"	258	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
253	bottom="-414" drop_shadow_visible="true" enabled="true" follows="left\|top"	259	bottom="-436" drop_shadow_visible="true" enabled="true" follows="left\|top"
254	font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"	260	font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
255	mouse_opaque="true" name="Options:" v_pad="0" width="100">	261	mouse_opaque="true" name="Options:" v_pad="0" width="100">
256	Options:	262	Options:


diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml index e50d02d..ad43c9d 100644 --- a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml +++ b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
@@ -88,6 +88,14 @@
88	mouse_opaque="true" name="New Underpants" width="128">	88	mouse_opaque="true" name="New Underpants" width="128">
89	<on_click filter="" function="Inventory.DoCreate" userdata="underpants" />	89	<on_click filter="" function="Inventory.DoCreate" userdata="underpants" />
90	</menu_item_call>	90	</menu_item_call>
		91	<menu_item_call bottom_delta="-18" height="18" label="New Tattoo" left="0"
		92	mouse_opaque="true" name="New Tattoo" width="128">
		93	<on_click filter="" function="Inventory.DoCreate" userdata="tattoo" />
		94	</menu_item_call>
		95	<menu_item_call bottom_delta="-18" height="18" label="New Alpha" left="0"
		96	mouse_opaque="true" name="New Alpha" width="128">
		97	<on_click filter="" function="Inventory.DoCreate" userdata="alpha" />
		98	</menu_item_call>
91	</menu>	99	</menu>
92	<menu bottom_delta="0" color="MenuDefaultBgColor" drop_shadow="true" height="175" left="0"	100	<menu bottom_delta="0" color="MenuDefaultBgColor" drop_shadow="true" height="175" left="0"
93	mouse_opaque="false" name="New Body Parts" opaque="true" tear_off="false"	101	mouse_opaque="false" name="New Body Parts" opaque="true" tear_off="false"