From 1f0470e33404408c6228c9d0e3753f7ba43d3d96 Mon Sep 17 00:00:00 2001
From: Chuck Linden <chuck@lindenlab.com>
Date: Wed, 20 Jan 2010 15:44:34 -0500
Subject: Finished layout of appearance editor.
 http://jira.secondlife.com/browse/EXT-146

---
 .../skins/default/xui/en/floater_customize.xml     | 1496 ++++++++++----------
 .../skins/default/xui/en/widgets/color_swatch.xml  |    2 +-
 2 files changed, 730 insertions(+), 768 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml
index ddc0d9af72..b048eeceb6 100644
--- a/indra/newview/skins/default/xui/en/floater_customize.xml
+++ b/indra/newview/skins/default/xui/en/floater_customize.xml
@@ -3,7 +3,7 @@
  legacy_header_height="18"
  can_minimize="false"
  follows="left|top"
- height="607"
+ height="583"
  layout="topleft"
  left_delta="-3"
  name="floater customize"
@@ -20,7 +20,7 @@
      tab_min_width="96"
      tab_position="left"
      tab_height="50"
-     top="50"
+     top="26"
      width="506">
             <text
              type="string"
@@ -184,7 +184,6 @@
                  layout="topleft"
                  name="radio2"
                  value="1"
-		 top="32"
                  width="82" />
             </radio_group>
             <text
@@ -270,9 +269,9 @@
              follows="left|top|right"
              height="28"
              layout="topleft"
-             left_delta="0"
+             left="10"
              name="no modify instructions"
-             top_delta="0"
+             top="31"
              word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
@@ -473,9 +472,9 @@
              follows="left|top|right"
              height="28"
              layout="topleft"
-             left_delta="0"
+             left="10"
              name="no modify instructions"
-             top_delta="0"
+             top="31"
              word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
@@ -723,9 +722,9 @@
              follows="left|top|right"
              height="28"
              layout="topleft"
-             left_delta="0"
+             left="10"
              name="no modify instructions"
-             top_delta="0"
+             top="31"
              word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
@@ -798,16 +797,16 @@
              width="82" />
         </panel>
         <panel
-         border="true"
+         border="false"
+ background_visible="true"
+ bg_alpha_color="DkGray2"
          follows="left|top|right|bottom"
-         height="481"
+         height="508"
          label="Eyes"
          layout="topleft"
-         left_delta="0"
          name="Eyes"
          help_topic="customize_eyes_tab"
-         top_delta="0"
-         width="389">
+         width="400">
             <icon
              follows="top|right"
              height="18"
@@ -820,10 +819,10 @@
              width="18" />
             <icon
              height="16"
+	     top="10"
+	     left="10"
              layout="topleft"
-             left_delta="-325"
              mouse_opaque="true"
-             top_delta="3"
              width="16" />
             <text
              type="string"
@@ -832,9 +831,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_pad="2"
+             left="31"
              name="title"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]
             </text>
@@ -845,9 +844,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_no_modify"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: cannot modify
             </text>
@@ -858,9 +857,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_loading"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: loading...
             </text>
@@ -871,21 +870,21 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_not_worn"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: not worn
             </text>
             <text
              type="string"
              length="1"
-             follows="left|top|right"
-             height="14"
+             follows="left|top"
+             height="16"
              layout="topleft"
-             left="8"
+             left="10"
              name="path"
-             top="24"
+             top="36"
              width="373">
                 Located in [PATH]
             </text>
@@ -895,9 +894,9 @@
              follows="left|top|right"
              height="28"
              layout="topleft"
-             left_delta="0"
+             left="10"
              name="not worn instructions"
-             top_pad="8"
+             top="31"
              word_wrap="true"
              width="373">
                 Put on a new set of eyes by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
@@ -908,9 +907,9 @@
              follows="left|top|right"
              height="28"
              layout="topleft"
-             left_delta="0"
+             left="10"
              name="no modify instructions"
-             top_delta="0"
+             top="31"
              word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
@@ -918,14 +917,14 @@
             <text
              type="string"
              length="1"
-             bottom="486"
-             follows="left|top|right"
+             bottom="4"
+             follows="left|bottom|right"
              font="SansSerif"
              halign="right"
-             height="28"
-             layout="topleft"
+             height="23"
+             layout="bottomleft"
              name="Item Action Label"
-             right="117"
+             right="132"
              width="100">
                 Eyes:
             </text>
@@ -933,23 +932,22 @@
              can_apply_immediately="true"
              default_image_name="Default"
              follows="left|top"
-             height="80"
+             height="108"
              label="Iris"
              layout="topleft"
-             left="8"
+             left="10"
              name="Iris"
              tool_tip="Click to choose a picture"
-             top="65"
-             width="64" />
+             top="66"
+             width="82" />
             <button
              follows="left|top"
              height="23"
              label="Create New Eyes"
              label_selected="Create New Eyes"
              layout="topleft"
-             left_delta="0"
              name="Create New"
-             top_delta="39"
+             top="66"
              width="160" />
             <button
              follows="right|bottom"
@@ -957,9 +955,9 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             left="123"
+             right="218"
              name="Save"
-             top="458"
+             top="477"
              width="82" />
             <button
              follows="right|bottom"
@@ -967,9 +965,9 @@
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             left_pad="6"
+             right="304"
              name="Save As"
-             top_delta="0"
+             top="477"
              width="82" />
             <button
              follows="right|bottom"
@@ -977,9 +975,9 @@
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             left_pad="6"
+             right="390"
              name="Revert"
-             top_delta="0"
+             top="477"
              width="82" />
         </panel>
             <text
@@ -997,85 +995,83 @@
             </text>
 	    <placeholder />
         <panel
-         border="true"
+         border="false"
+ background_visible="true"
+ bg_alpha_color="DkGray2"
          follows="left|top|right|bottom"
-         height="481"
+         height="508"
          label="Shirt"
          layout="topleft"
-         left_delta="0"
          name="Shirt"
          help_topic="customize_shirt_tab"
          top_delta="0"
-         width="389">
+         width="400">
             <icon
-             follows="top|right"
+             follows="top|left"
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="315"
+             left="10"
              mouse_opaque="true"
              name="square"
-             top="4"
+             top="10"
              width="18" />
             <icon
              height="16"
+	     top="10"
+	     left="10"
              layout="topleft"
-             left="8"
              mouse_opaque="true"
-             top_delta="3"
              width="16" />
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
              follows="left|top"
-             height="80"
+             height="108"
              label="Fabric"
              layout="topleft"
-             left_delta="0"
+             left="10"
              name="Fabric"
              tool_tip="Click to choose a picture"
-             top_pad="41"
-             width="64" />
+             top="66"
+             width="82" />
             <color_swatch
              can_apply_immediately="true"
              follows="left|top"
-             height="80"
+             height="108"
              label="Color/Tint"
              layout="topleft"
-             left_delta="0"
              name="Color/Tint"
              tool_tip="Click to open color picker"
-             top_delta="80"
-             width="64" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Shirt"
-             label_selected="Create New Shirt"
-             layout="topleft"
-             left_delta="0"
-             name="Create New"
-             top_delta="-41"
-             width="160" />
+             top_delta="102"
+             width="82" />
             <button
              follows="left|top"
              height="23"
              label="Take Off"
              label_selected="Take Off"
              layout="topleft"
-             left_delta="0"
              name="Take Off"
-             top_pad="102"
+             top_pad="4"
              width="82" />
+            <button
+             follows="left|top"
+             height="23"
+             label="Create New Shirt"
+             label_selected="Create New Shirt"
+             layout="topleft"
+             name="Create New"
+             top="66"
+             width="160" />
             <button
              follows="right|bottom"
              height="23"
              label="Save"
              label_selected="Save"
              layout="topleft"
-             left="123"
+             right="218"
              name="Save"
-             top="458"
+             top="477"
              width="82" />
             <button
              follows="right|bottom"
@@ -1083,9 +1079,9 @@
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             left_pad="6"
+             right="304"
              name="Save As"
-             top_delta="0"
+             top="477"
              width="82" />
             <button
              follows="right|bottom"
@@ -1093,9 +1089,9 @@
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             left_pad="6"
+             right="390"
              name="Revert"
-             top_delta="0"
+             top="477"
              width="82" />
             <text
              type="string"
@@ -1104,9 +1100,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left="8"
+             left="31"
              name="title"
-             top="8"
+             top="10"
              width="355">
                 [DESC]
             </text>
@@ -1117,9 +1113,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_no_modify"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: cannot modify
             </text>
@@ -1130,9 +1126,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_loading"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: loading...
             </text>
@@ -1143,21 +1139,21 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_not_worn"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: not worn
             </text>
             <text
              type="string"
              length="1"
-             follows="left|top|right"
-             height="14"
+             follows="left|top"
+             height="16"
              layout="topleft"
-             left="8"
+             left="10"
              name="path"
-             top="24"
+             top="36"
              width="373">
                 Located in [PATH]
             </text>
@@ -1167,9 +1163,9 @@
              follows="left|top|right"
              height="28"
              layout="topleft"
-             left_delta="0"
+             left="10"
              name="not worn instructions"
-             top_pad="8"
+             top="31"
              word_wrap="true"
              width="373">
                 Put on a new shirt by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
@@ -1180,9 +1176,9 @@
              follows="left|top|right"
              height="28"
              layout="topleft"
-             left_delta="0"
+             left="10"
              name="no modify instructions"
-             top_delta="0"
+             top="31"
              word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
@@ -1190,98 +1186,95 @@
             <text
              type="string"
              length="1"
-             bottom="486"
-             follows="left|top|right"
+             bottom="4"
+             follows="left|bottom|right"
              font="SansSerif"
              halign="right"
-             height="28"
-             layout="topleft"
+             height="23"
+             layout="bottomleft"
              name="Item Action Label"
-             right="117"
+             right="132"
              width="100">
                 Shirt:
             </text>
         </panel>
         <panel
-         border="true"
+         border="false"
+ background_visible="true"
+ bg_alpha_color="DkGray2"
          follows="left|top|right|bottom"
-         height="481"
+         height="508"
          label="Pants"
          layout="topleft"
-         left_delta="0"
          name="Pants"
          help_topic="customize_pants_tab"
-         top_delta="0"
-         width="389">
+         width="400">
             <icon
-             follows="top|right"
+             follows="top|left"
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="315"
+             left="10"
              mouse_opaque="true"
              name="square"
-             top="4"
+             top="10"
              width="18" />
             <icon
              height="16"
              layout="topleft"
-             left="8"
+	     left="10"
              mouse_opaque="true"
-             top_delta="3"
+	     top="10"
              width="16" />
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
              follows="left|top"
-             height="80"
+             height="108"
              label="Fabric"
              layout="topleft"
-             left_delta="0"
+             left="10"
              name="Fabric"
              tool_tip="Click to choose a picture"
-             top_pad="41"
-             width="64" />
+             top="66"
+             width="82" />
             <color_swatch
              can_apply_immediately="true"
              follows="left|top"
-             height="80"
+             height="108"
              label="Color/Tint"
              layout="topleft"
-             left_delta="0"
              name="Color/Tint"
              tool_tip="Click to open color picker"
-             top_delta="80"
-             width="64" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Pants"
-             label_selected="Create New Pants"
-             layout="topleft"
-             left_delta="0"
-             name="Create New"
-             top_delta="-41"
-             width="160" />
+             top_delta="102"
+             width="82" />
             <button
              follows="left|top"
              height="23"
              label="Take Off"
              label_selected="Take Off"
              layout="topleft"
-             left_delta="0"
              name="Take Off"
-             top_pad="102"
+             top_pad="4"
              width="82" />
+            <button
+             follows="left|top"
+             height="23"
+             label="Create New Pants"
+             label_selected="Create New Pants"
+             layout="topleft"
+             name="Create New"
+             top="66"
+             width="160" />
             <button
              follows="right|bottom"
              height="23"
              label="Save"
              label_selected="Save"
              layout="topleft"
-             left="123"
+             right="218"
              name="Save"
-             top="458"
+             top="477"
              width="82" />
             <button
              follows="right|bottom"
@@ -1289,9 +1282,9 @@
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             left_pad="6"
+             right="304"
              name="Save As"
-             top_delta="0"
+             top="477"
              width="82" />
             <button
              follows="right|bottom"
@@ -1299,9 +1292,9 @@
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             left_pad="6"
+             right="390"
              name="Revert"
-             top_delta="0"
+             top="477"
              width="82" />
             <text
              type="string"
@@ -1310,9 +1303,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left="8"
+             left="31"
              name="title"
-             top="8"
+             top="10"
              width="355">
                 [DESC]
             </text>
@@ -1323,9 +1316,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_no_modify"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: cannot modify
             </text>
@@ -1336,9 +1329,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_loading"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: loading...
             </text>
@@ -1349,9 +1342,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_not_worn"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: not worn
             </text>
@@ -1361,9 +1354,9 @@
              follows="left|top|right"
              height="14"
              layout="topleft"
-             left="8"
+             left="10"
              name="path"
-             top="24"
+             top="36"
              width="373">
                 Located in [PATH]
             </text>
@@ -1373,9 +1366,9 @@
              follows="left|top|right"
              height="28"
              layout="topleft"
-             left_delta="0"
+             left="10"
              name="not worn instructions"
-             top_pad="8"
+             top="31"
              word_wrap="true"
              width="373">
                 Put on new pants by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
@@ -1386,9 +1379,9 @@
              follows="left|top|right"
              height="28"
              layout="topleft"
-             left_delta="0"
+             left="10"
              name="no modify instructions"
-             top_delta="0"
+             top="31"
              word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
@@ -1396,45 +1389,45 @@
             <text
              type="string"
              length="1"
-             bottom="486"
-             follows="left|top|right"
+             bottom="4"
+             follows="left|bottom|right"
              font="SansSerif"
              halign="right"
-             height="28"
-             layout="topleft"
+             height="23"
+             layout="bottomleft"
              name="Item Action Label"
-             right="117"
+             right="132"
              width="100">
                 Pants:
             </text>
         </panel>
         <panel
-         border="true"
+         border="false"
+ background_visible="true"
+ bg_alpha_color="DkGray2"
          follows="left|top|right|bottom"
-         height="481"
+         height="508"
          label="Shoes"
          layout="topleft"
-         left_delta="0"
          name="Shoes"
          help_topic="customize_shoes_tab"
-         top_delta="0"
-         width="389">
+         width="400">
             <icon
-             follows="top|right"
+             follows="top|left"
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="315"
+             left="10"
              mouse_opaque="true"
              name="square"
-             top="4"
+             top="10"
              width="18" />
             <icon
              height="16"
              layout="topleft"
-             left_delta="-325"
+	     left="10"
              mouse_opaque="true"
-             top_delta="3"
+	     top="10"
              width="16" />
             <text
              type="string"
@@ -1443,9 +1436,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_pad="2"
+             left="31"
              name="title"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]
             </text>
@@ -1456,9 +1449,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_no_modify"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: cannot modify
             </text>
@@ -1469,9 +1462,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_loading"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: loading...
             </text>
@@ -1482,9 +1475,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_not_worn"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: not worn
             </text>
@@ -1494,9 +1487,9 @@
              follows="left|top|right"
              height="14"
              layout="topleft"
-             left="8"
+             left="10"
              name="path"
-             top="24"
+             top="36"
              width="373">
                 Located in [PATH]
             </text>
@@ -1506,22 +1499,31 @@
              follows="left|top|right"
              height="28"
              layout="topleft"
-             left_delta="0"
+             left="10"
              name="not worn instructions"
-             top_pad="8"
+             top="31"
              word_wrap="true"
              width="373">
                 Put on a new pair of shoes by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
+            <button
+             follows="left|top"
+             height="23"
+             label="Create New Shoes"
+             label_selected="Create New Shoes"
+             layout="topleft"
+             name="Create New"
+             top_pad="18"
+             width="160" />
             <text
              type="string"
              length="1"
              follows="left|top|right"
              height="28"
              layout="topleft"
-             left_delta="0"
+             left="10"
              name="no modify instructions"
-             top_delta="0"
+             top="31"
              word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
@@ -1529,14 +1531,14 @@
             <text
              type="string"
              length="1"
-             bottom="486"
-             follows="left|top|right"
+             bottom="4"
+             follows="left|bottom|right"
              font="SansSerif"
              halign="right"
-             height="28"
-             layout="topleft"
+             height="23"
+             layout="bottomleft"
              name="Item Action Label"
-             right="117"
+             right="132"
              width="100">
                 Shoes:
             </text>
@@ -1544,44 +1546,32 @@
              can_apply_immediately="true"
              default_image_name="Default"
              follows="left|top"
-             height="80"
+             height="108"
              label="Fabric"
              layout="topleft"
-             left="8"
+             left="10"
              name="Fabric"
              tool_tip="Click to choose a picture"
-             top="65"
-             width="64" />
+             top="66"
+             width="82" />
             <color_swatch
              can_apply_immediately="true"
              follows="left|top"
-             height="80"
+             height="108"
              label="Color/Tint"
              layout="topleft"
-             left_delta="0"
              name="Color/Tint"
              tool_tip="Click to open color picker"
-             top_delta="80"
-             width="64" />
+             top_delta="102"
+             width="82" />
             <button
              follows="left|top"
              height="23"
-             label="Create New Shoes"
-             label_selected="Create New Shoes"
+             label="Take Off"
+             label_selected="Take Off"
              layout="topleft"
-             left_delta="0"
-             name="Create New"
-             top_delta="-41"
-             width="160" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Take Off"
-             label_selected="Take Off"
-             layout="topleft"
-             left_delta="0"
              name="Take Off"
-             top_pad="102"
+             top_pad="4"
              width="82" />
             <button
              follows="right|bottom"
@@ -1589,9 +1579,9 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             left="123"
+             right="218"
              name="Save"
-             top="458"
+             top="477"
              width="82" />
             <button
              follows="right|bottom"
@@ -1599,9 +1589,9 @@
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             left_pad="6"
+             right="304"
              name="Save As"
-             top_delta="0"
+             top="477"
              width="82" />
             <button
              follows="right|bottom"
@@ -1609,38 +1599,38 @@
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             left_pad="6"
+             right="390"
              name="Revert"
-             top_delta="0"
+             top="477"
              width="82" />
         </panel>
         <panel
-         border="true"
+         border="false"
+ background_visible="true"
+ bg_alpha_color="DkGray2"
          follows="left|top|right|bottom"
-         height="481"
+         height="508"
          label="Socks"
          layout="topleft"
-         left_delta="0"
          name="Socks"
          help_topic="customize_socks_tab"
-         top_delta="0"
-         width="389">
+         width="400">
             <icon
-             follows="top|right"
+             follows="top|left"
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="315"
+             left="10"
              mouse_opaque="true"
              name="square"
-             top="4"
+             top="10"
              width="18" />
             <icon
              height="16"
              layout="topleft"
-             left_delta="-325"
+	     left="10"
              mouse_opaque="true"
-             top_delta="3"
+	     top="10"
              width="16" />
             <text
              type="string"
@@ -1649,9 +1639,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_pad="2"
+             left="31"
              name="title"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]
             </text>
@@ -1662,9 +1652,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_no_modify"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: cannot modify
             </text>
@@ -1675,9 +1665,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_loading"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: loading...
             </text>
@@ -1688,9 +1678,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_not_worn"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: not worn
             </text>
@@ -1700,9 +1690,9 @@
              follows="left|top|right"
              height="14"
              layout="topleft"
-             left="8"
+             left="10"
              name="path"
-             top="24"
+             top="36"
              width="373">
                 Located in [PATH]
             </text>
@@ -1712,22 +1702,31 @@
              follows="left|top|right"
              height="28"
              layout="topleft"
-             left_delta="0"
+             left="10"
              name="not worn instructions"
-             top_pad="8"
+             top="31"
              word_wrap="true"
              width="373">
                 Put on new socks by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
+            <button
+             follows="left|top"
+             height="23"
+             label="Create New Socks"
+             label_selected="Create New Socks"
+             layout="topleft"
+             name="Create New"
+             top_pad="7"
+             width="160" />
             <text
              type="string"
              length="1"
              follows="left|top|right"
              height="28"
              layout="topleft"
-             left_delta="0"
+             left="10"
              name="no modify instructions"
-             top_delta="0"
+             top="31"
              word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
@@ -1735,14 +1734,14 @@
             <text
              type="string"
              length="1"
-             bottom="486"
-             follows="left|top|right"
+             bottom="4"
+             follows="left|bottom|right"
              font="SansSerif"
              halign="right"
-             height="28"
-             layout="topleft"
+             height="23"
+             layout="bottomleft"
              name="Item Action Label"
-             right="117"
+             right="132"
              width="100">
                 Socks:
             </text>
@@ -1750,44 +1749,32 @@
              can_apply_immediately="true"
              default_image_name="Default"
              follows="left|top"
-             height="80"
+             height="108"
              label="Fabric"
              layout="topleft"
-             left="8"
+             left="10"
              name="Fabric"
              tool_tip="Click to choose a picture"
-             top="65"
-             width="64" />
+             top="66"
+             width="82" />
             <color_swatch
              can_apply_immediately="true"
              follows="left|top"
-             height="80"
+             height="108"
              label="Color/Tint"
              layout="topleft"
-             left_delta="0"
              name="Color/Tint"
              tool_tip="Click to open color picker"
-             top_delta="80"
-             width="64" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Socks"
-             label_selected="Create New Socks"
-             layout="topleft"
-             left_delta="0"
-             name="Create New"
-             top_delta="-41"
-             width="160" />
+             top_delta="102"
+             width="82" />
             <button
              follows="left|top"
              height="23"
              label="Take Off"
              label_selected="Take Off"
              layout="topleft"
-             left_delta="0"
              name="Take Off"
-             top_pad="102"
+             top_pad="4"
              width="82" />
             <button
              follows="right|bottom"
@@ -1795,9 +1782,9 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             left="123"
+             right="218"
              name="Save"
-             top="458"
+             top="477"
              width="82" />
             <button
              follows="right|bottom"
@@ -1805,9 +1792,9 @@
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             left_pad="6"
+             right="304"
              name="Save As"
-             top_delta="0"
+             top="477"
              width="82" />
             <button
              follows="right|bottom"
@@ -1815,38 +1802,38 @@
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             left_pad="6"
+             right="390"
              name="Revert"
-             top_delta="0"
+             top="477"
              width="82" />
         </panel>
         <panel
-         border="true"
+         border="false"
+ background_visible="true"
+ bg_alpha_color="DkGray2"
          follows="left|top|right|bottom"
-         height="481"
+         height="508"
          label="Jacket"
          layout="topleft"
-         left_delta="0"
          name="Jacket"
          help_topic="customize_jacket_tab"
-         top_delta="0"
-         width="389">
+         width="400">
             <icon
-             follows="top|right"
+             follows="top|left"
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="315"
+             left="10"
              mouse_opaque="true"
              name="square"
-             top="4"
+             top="10"
              width="18" />
             <icon
              height="16"
              layout="topleft"
-             left_delta="-325"
+	     left="10"
              mouse_opaque="true"
-             top_delta="3"
+	     top="10"
              width="16" />
             <text
              type="string"
@@ -1855,9 +1842,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_pad="2"
+             left="31"
              name="title"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]
             </text>
@@ -1868,9 +1855,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_no_modify"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: cannot modify
             </text>
@@ -1881,9 +1868,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_loading"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: loading...
             </text>
@@ -1894,9 +1881,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_not_worn"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: not worn
             </text>
@@ -1906,9 +1893,9 @@
              follows="left|top|right"
              height="14"
              layout="topleft"
-             left="8"
+             left="10"
              name="path"
-             top="24"
+             top="36"
              width="373">
                 Located in [PATH]
             </text>
@@ -1918,22 +1905,31 @@
              follows="left|top|right"
              height="28"
              layout="topleft"
-             left_delta="0"
+             left="10"
              name="not worn instructions"
-             top_pad="8"
+             top="31"
              word_wrap="true"
              width="373">
                 Put on a new jacket by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
+            <button
+             follows="left|top"
+             height="23"
+             label="Create New Jacket"
+             label_selected="Create New Jacket"
+             layout="topleft"
+             name="Create New"
+             top_pad="7"
+             width="160" />
             <text
              type="string"
              length="1"
              follows="left|top|right"
              height="28"
              layout="topleft"
-             left_delta="0"
+             left="10"
              name="no modify instructions"
-             top_delta="0"
+             top="31"
              word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
@@ -1941,14 +1937,14 @@
             <text
              type="string"
              length="1"
-             bottom="486"
-             follows="left|top|right"
+             bottom="4"
+             follows="left|bottom|right"
              font="SansSerif"
              halign="right"
-             height="28"
-             layout="topleft"
+             height="23"
+             layout="bottomleft"
              name="Item Action Label"
-             right="117"
+             right="132"
              width="100">
                 Jacket:
             </text>
@@ -1956,56 +1952,43 @@
              can_apply_immediately="true"
              default_image_name="Default"
              follows="left|top"
-             height="80"
+             height="108"
              label="Upper Fabric"
              layout="topleft"
-             left="8"
+             left="10"
              name="Upper Fabric"
              tool_tip="Click to choose a picture"
-             top="65"
-             width="64" />
+             top="66"
+             width="82" />
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
              follows="left|top"
-             height="80"
+             height="108"
              label="Lower Fabric"
              layout="topleft"
-             left_delta="0"
              name="Lower Fabric"
              tool_tip="Click to choose a picture"
-             top_delta="80"
-             width="64" />
+             top_delta="102"
+             width="82" />
             <color_swatch
              can_apply_immediately="true"
              follows="left|top"
-             height="80"
+             height="108"
              label="Color/Tint"
              layout="topleft"
-             left_delta="0"
              name="Color/Tint"
              tool_tip="Click to open color picker"
-             top_delta="80"
-             width="64" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Jacket"
-             label_selected="Create New Jacket"
-             layout="topleft"
-             left_delta="0"
-             name="Create New"
-             top_delta="-121"
-             width="160" />
+             top_delta="102"
+             width="82" />
             <button
              follows="left|top"
              height="23"
              label="Take Off"
              label_selected="Take Off"
              layout="topleft"
-             left_delta="0"
              name="Take Off"
-             top_pad="182"
+             top_pad="4"
              width="82" />
             <button
              follows="right|bottom"
@@ -2013,9 +1996,9 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             left="123"
+             right="218"
              name="Save"
-             top="458"
+             top="477"
              width="82" />
             <button
              follows="right|bottom"
@@ -2023,9 +2006,9 @@
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             left_pad="6"
+             right="304"
              name="Save As"
-             top_delta="0"
+             top="477"
              width="82" />
             <button
              follows="right|bottom"
@@ -2033,38 +2016,38 @@
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             left_pad="6"
+             right="390"
              name="Revert"
-             top_delta="0"
+             top="477"
              width="82" />
         </panel>
         <panel
-         border="true"
+         border="false"
+ background_visible="true"
+ bg_alpha_color="DkGray2"
          follows="left|top|right|bottom"
-         height="481"
+         height="508"
          label="Gloves"
          layout="topleft"
-         left_delta="0"
          name="Gloves"
          help_topic="customize_gloves_tab"
-         top_delta="0"
-         width="389">
+         width="400">
             <icon
-             follows="top|right"
+             follows="top|left"
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="315"
+             left="10"
              mouse_opaque="true"
              name="square"
-             top="4"
+             top="10"
              width="18" />
             <icon
              height="16"
              layout="topleft"
-             left_delta="-325"
+	     left="10"
              mouse_opaque="true"
-             top_delta="3"
+	     top="10"
              width="16" />
             <text
              type="string"
@@ -2073,9 +2056,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_pad="2"
+             left="31"
              name="title"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]
             </text>
@@ -2086,9 +2069,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_no_modify"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: cannot modify
             </text>
@@ -2099,9 +2082,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_loading"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: loading...
             </text>
@@ -2112,9 +2095,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_not_worn"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: not worn
             </text>
@@ -2124,9 +2107,9 @@
              follows="left|top|right"
              height="14"
              layout="topleft"
-             left="8"
+             left="10"
              name="path"
-             top="24"
+             top="36"
              width="373">
                 Located in [PATH]
             </text>
@@ -2136,22 +2119,31 @@
              follows="left|top|right"
              height="28"
              layout="topleft"
-             left_delta="0"
+             left="10"
              name="not worn instructions"
-             top_pad="8"
+             top="31"
              word_wrap="true"
              width="373">
                 Put on new gloves by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
+            <button
+             follows="left|top"
+             height="23"
+             label="Create New Gloves"
+             label_selected="Create New Gloves"
+             layout="topleft"
+             name="Create New"
+             top_pad="7"
+             width="160" />
             <text
              type="string"
              length="1"
              follows="left|top|right"
              height="28"
              layout="topleft"
-             left_delta="0"
+             left="10"
              name="no modify instructions"
-             top_delta="0"
+             top="31"
              word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
@@ -2159,14 +2151,14 @@
             <text
              type="string"
              length="1"
-             bottom="486"
-             follows="left|top|right"
+             bottom="4"
+             follows="left|bottom|right"
              font="SansSerif"
              halign="right"
-             height="28"
-             layout="topleft"
+             height="23"
+             layout="bottomleft"
              name="Item Action Label"
-             right="117"
+             right="132"
              width="100">
                 Gloves:
             </text>
@@ -2174,44 +2166,32 @@
              can_apply_immediately="true"
              default_image_name="Default"
              follows="left|top"
-             height="80"
+             height="108"
              label="Fabric"
              layout="topleft"
-             left="8"
+             left="10"
              name="Fabric"
              tool_tip="Click to choose a picture"
-             top="65"
-             width="64" />
+             top="66"
+             width="82" />
             <color_swatch
              can_apply_immediately="true"
              follows="left|top"
-             height="80"
+             height="108"
              label="Color/Tint"
              layout="topleft"
-             left_delta="0"
              name="Color/Tint"
              tool_tip="Click to open color picker"
-             top_delta="80"
-             width="64" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Gloves"
-             label_selected="Create New Gloves"
-             layout="topleft"
-             left_delta="0"
-             name="Create New"
-             top_delta="-41"
-             width="160" />
+             top_delta="102"
+             width="82" />
             <button
              follows="left|top"
              height="23"
              label="Take Off"
              label_selected="Take Off"
              layout="topleft"
-             left_delta="0"
              name="Take Off"
-             top_pad="102"
+             top_pad="4"
              width="82" />
             <button
              follows="right|bottom"
@@ -2219,9 +2199,9 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             left="123"
+             right="218"
              name="Save"
-             top="458"
+             top="477"
              width="82" />
             <button
              follows="right|bottom"
@@ -2229,9 +2209,9 @@
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             left_pad="6"
+             right="304"
              name="Save As"
-             top_delta="0"
+             top="477"
              width="82" />
             <button
              follows="right|bottom"
@@ -2239,38 +2219,38 @@
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             left_pad="6"
+             right="390"
              name="Revert"
-             top_delta="0"
+             top="477"
              width="82" />
         </panel>
         <panel
-         border="true"
+         border="false"
+ background_visible="true"
+ bg_alpha_color="DkGray2"
          follows="left|top|right|bottom"
-         height="481"
+         height="508"
          label="Undershirt"
          layout="topleft"
-         left_delta="0"
          name="Undershirt"
          help_topic="customize_undershirt_tab"
-         top_delta="0"
-         width="389">
+         width="400">
             <icon
-             follows="top|right"
+             follows="top|left"
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="315"
+             left="10"
              mouse_opaque="true"
              name="square"
-             top="4"
+             top="10"
              width="18" />
             <icon
              height="16"
              layout="topleft"
-             left_delta="-325"
+	     left="10"
              mouse_opaque="true"
-             top_delta="3"
+	     top="10"
              width="16" />
             <text
              type="string"
@@ -2279,9 +2259,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_pad="2"
+             left="31"
              name="title"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]
             </text>
@@ -2292,9 +2272,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_no_modify"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: cannot modify
             </text>
@@ -2305,9 +2285,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_loading"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: loading...
             </text>
@@ -2318,9 +2298,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_not_worn"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: not worn
             </text>
@@ -2330,9 +2310,9 @@
              follows="left|top|right"
              height="14"
              layout="topleft"
-             left="8"
+             left="10"
              name="path"
-             top="24"
+             top="36"
              width="373">
                 Located in [PATH]
             </text>
@@ -2342,22 +2322,31 @@
              follows="left|top|right"
              height="28"
              layout="topleft"
-             left_delta="0"
+             left="10"
              name="not worn instructions"
-             top_pad="8"
+             top="31"
              word_wrap="true"
              width="373">
                 Put on a new undershirt by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
-            <text
+            <button
+             follows="left|top"
+             height="23"
+             label="Create New Undershirt"
+             label_selected="Create New Undershirt"
+             layout="topleft"
+             name="Create New"
+             top_pad="7"
+             width="160" />
+            <text
              type="string"
              length="1"
              follows="left|top|right"
              height="28"
              layout="topleft"
-             left_delta="0"
+             left="10"
              name="no modify instructions"
-             top_delta="0"
+             top="31"
              word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
@@ -2365,14 +2354,14 @@
             <text
              type="string"
              length="1"
-             bottom="486"
-             follows="left|top|right"
+             bottom="4"
+             follows="left|bottom|right"
              font="SansSerif"
              halign="right"
-             height="28"
-             layout="topleft"
+             height="23"
+             layout="bottomleft"
              name="Item Action Label"
-             right="117"
+             right="132"
              width="100">
                 Undershirt:
             </text>
@@ -2380,44 +2369,32 @@
              can_apply_immediately="true"
              default_image_name="Default"
              follows="left|top"
-             height="80"
+             height="108"
              label="Fabric"
              layout="topleft"
-             left="8"
+             left="10"
              name="Fabric"
              tool_tip="Click to choose a picture"
-             top="65"
-             width="64" />
+             top="66"
+             width="82" />
             <color_swatch
              can_apply_immediately="true"
              follows="left|top"
-             height="80"
+             height="108"
              label="Color/Tint"
              layout="topleft"
-             left_delta="0"
              name="Color/Tint"
              tool_tip="Click to open color picker"
-             top_delta="80"
-             width="64" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Undershirt"
-             label_selected="Create New Undershirt"
-             layout="topleft"
-             left_delta="0"
-             name="Create New"
-             top_delta="-41"
-             width="160" />
+             top_delta="102"
+             width="82" />
             <button
              follows="left|top"
              height="23"
              label="Take Off"
              label_selected="Take Off"
              layout="topleft"
-             left_delta="0"
              name="Take Off"
-             top_pad="102"
+             top_pad="4"
              width="82" />
             <button
              follows="right|bottom"
@@ -2425,9 +2402,9 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             left="123"
+             right="218"
              name="Save"
-             top="458"
+             top="477"
              width="82" />
             <button
              follows="right|bottom"
@@ -2435,9 +2412,9 @@
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             left_pad="6"
+             right="304"
              name="Save As"
-             top_delta="0"
+             top="477"
              width="82" />
             <button
              follows="right|bottom"
@@ -2445,38 +2422,38 @@
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             left_pad="6"
+             right="390"
              name="Revert"
-             top_delta="0"
+             top="477"
              width="82" />
         </panel>
         <panel
-         border="true"
+         border="false"
+ background_visible="true"
+ bg_alpha_color="DkGray2"
          follows="left|top|right|bottom"
-         height="481"
+         height="508"
          label="Underpants"
          layout="topleft"
-         left_delta="0"
          name="Underpants"
          help_topic="customize_underpants_tab"
-         top_delta="0"
-         width="389">
+         width="400">
             <icon
-             follows="top|right"
+             follows="top|left"
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="315"
+             left="10"
              mouse_opaque="true"
              name="square"
-             top="4"
+             top="10"
              width="18" />
             <icon
              height="16"
              layout="topleft"
-             left_delta="-325"
+	     left="10"
              mouse_opaque="true"
-             top_delta="3"
+	     top="10"
              width="16" />
             <text
              type="string"
@@ -2485,9 +2462,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_pad="2"
+             left="31"
              name="title"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]
             </text>
@@ -2498,9 +2475,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_no_modify"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: cannot modify
             </text>
@@ -2511,9 +2488,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_loading"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: loading...
             </text>
@@ -2524,9 +2501,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_not_worn"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: not worn
             </text>
@@ -2536,9 +2513,9 @@
              follows="left|top|right"
              height="14"
              layout="topleft"
-             left="8"
+             left="10"
              name="path"
-             top="24"
+             top="36"
              width="373">
                 Located in [PATH]
             </text>
@@ -2548,22 +2525,31 @@
              follows="left|top|right"
              height="28"
              layout="topleft"
-             left_delta="0"
+             left="10"
              name="not worn instructions"
-             top_pad="8"
+             top="31"
              word_wrap="true"
              width="373">
                 Put on new underpants by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
+            <button
+             follows="left|top"
+             height="23"
+             label="Create New Underpants"
+             label_selected="Create New Underpants"
+             layout="topleft"
+             name="Create New"
+             top_pad="7"
+             width="160" />
             <text
              type="string"
              length="1"
              follows="left|top|right"
              height="28"
              layout="topleft"
-             left_delta="0"
+             left="10"
              name="no modify instructions"
-             top_delta="0"
+             top="31"
              word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
@@ -2571,14 +2557,14 @@
             <text
              type="string"
              length="1"
-             bottom="486"
-             follows="left|top|right"
+             bottom="4"
+             follows="left|bottom|right"
              font="SansSerif"
              halign="right"
-             height="28"
-             layout="topleft"
+             height="23"
+             layout="bottomleft"
              name="Item Action Label"
-             right="117"
+             right="132"
              width="100">
                 Underpants:
             </text>
@@ -2586,44 +2572,32 @@
              can_apply_immediately="true"
              default_image_name="Default"
              follows="left|top"
-             height="80"
+             height="108"
              label="Fabric"
              layout="topleft"
-             left="8"
+             left="10"
              name="Fabric"
              tool_tip="Click to choose a picture"
-             top="65"
-             width="64" />
+             top="66"
+             width="82" />
             <color_swatch
              can_apply_immediately="true"
              follows="left|top"
-             height="80"
+             height="108"
              label="Color/Tint"
              layout="topleft"
-             left_delta="0"
              name="Color/Tint"
              tool_tip="Click to open color picker"
-             top_delta="80"
-             width="64" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Underpants"
-             label_selected="Create New Underpants"
-             layout="topleft"
-             left_delta="0"
-             name="Create New"
-             top_delta="-41"
-             width="160" />
+             top_delta="102"
+             width="82" />
             <button
              follows="left|top"
              height="23"
              label="Take Off"
              label_selected="Take Off"
              layout="topleft"
-             left_delta="0"
              name="Take Off"
-             top_pad="102"
+             top_pad="4"
              width="82" />
             <button
              follows="right|bottom"
@@ -2631,9 +2605,9 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             left="123"
+             right="218"
              name="Save"
-             top="458"
+             top="477"
              width="82" />
             <button
              follows="right|bottom"
@@ -2641,9 +2615,9 @@
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             left_pad="6"
+             right="304"
              name="Save As"
-             top_delta="0"
+             top="477"
              width="82" />
             <button
              follows="right|bottom"
@@ -2651,38 +2625,38 @@
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             left_pad="6"
+             right="390"
              name="Revert"
-             top_delta="0"
+             top="477"
              width="82" />
         </panel>
         <panel
-         border="true"
+         border="false"
+ background_visible="true"
+ bg_alpha_color="DkGray2"
          follows="left|top|right|bottom"
-         height="481"
+         height="508"
          label="Skirt"
          layout="topleft"
-         left_delta="0"
          name="Skirt"
          help_topic="customize_skirt_tab"
-         top_delta="0"
-         width="389">
+         width="400">
             <icon
-             follows="top|right"
+             follows="top|left"
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="315"
+             left="10"
              mouse_opaque="true"
              name="square"
-             top="4"
+             top="10"
              width="18" />
             <icon
              height="16"
              layout="topleft"
-             left_delta="-325"
+	     left="10"
              mouse_opaque="true"
-             top_delta="3"
+	     top="10"
              width="16" />
             <text
              type="string"
@@ -2691,9 +2665,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_pad="2"
+             left="31"
              name="title"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]
             </text>
@@ -2704,9 +2678,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_no_modify"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: cannot modify
             </text>
@@ -2717,9 +2691,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_loading"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: loading...
             </text>
@@ -2730,9 +2704,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_not_worn"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: not worn
             </text>
@@ -2742,9 +2716,9 @@
              follows="left|top|right"
              height="14"
              layout="topleft"
-             left="8"
+             left="10"
              name="path"
-             top="24"
+             top="36"
              width="373">
                 Located in [PATH]
             </text>
@@ -2754,22 +2728,31 @@
              follows="left|top|right"
              height="28"
              layout="topleft"
-             left_delta="0"
+             left="10"
              name="not worn instructions"
-             top_pad="8"
+             top="31"
              word_wrap="true"
              width="373">
                 Put on a new skirt by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
+            <button
+             follows="left|top"
+             height="23"
+             label="Create New Skirt"
+             label_selected="Create New Skirt"
+             layout="topleft"
+             name="Create New"
+             top_pad="7"
+             width="160" />
             <text
              type="string"
              length="1"
              follows="left|top|right"
              height="28"
              layout="topleft"
-             left_delta="0"
+             left="10"
              name="no modify instructions"
-             top_delta="0"
+             top="31"
              word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
@@ -2777,14 +2760,14 @@
             <text
              type="string"
              length="1"
-             bottom="486"
-             follows="left|top|right"
+             bottom="4"
+             follows="left|bottom|right"
              font="SansSerif"
              halign="right"
-             height="28"
-             layout="topleft"
+             height="23"
+             layout="bottomleft"
              name="Item Action Label"
-             right="117"
+             right="132"
              width="100">
                 Skirt:
             </text>
@@ -2792,44 +2775,32 @@
              can_apply_immediately="true"
              default_image_name="Default"
              follows="left|top"
-             height="80"
+             height="108"
              label="Fabric"
              layout="topleft"
-             left="8"
+             left="10"
              name="Fabric"
              tool_tip="Click to choose a picture"
-             top="65"
-             width="64" />
+             top="66"
+             width="82" />
             <color_swatch
              can_apply_immediately="true"
              follows="left|top"
-             height="80"
+             height="108"
              label="Color/Tint"
              layout="topleft"
-             left_delta="0"
              name="Color/Tint"
              tool_tip="Click to open color picker"
-             top_delta="80"
-             width="64" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Skirt"
-             label_selected="Create New Skirt"
-             layout="topleft"
-             left_delta="0"
-             name="Create New"
-             top_delta="-41"
-             width="160" />
+             top_delta="102"
+             width="82" />
             <button
              follows="left|top"
              height="23"
              label="Take Off"
              label_selected="Take Off"
              layout="topleft"
-             left_delta="0"
              name="Take Off"
-             top_pad="102"
+             top_pad="4"
              width="82" />
             <button
              follows="right|bottom"
@@ -2837,9 +2808,9 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             left="123"
+             right="218"
              name="Save"
-             top="458"
+             top="477"
              width="82" />
             <button
              follows="right|bottom"
@@ -2847,9 +2818,9 @@
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             left_pad="6"
+             right="304"
              name="Save As"
-             top_delta="0"
+             top="477"
              width="82" />
             <button
              follows="right|bottom"
@@ -2857,38 +2828,38 @@
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             left_pad="6"
+             right="390"
              name="Revert"
-             top_delta="0"
+             top="477"
              width="82" />
         </panel>
         <panel
-         border="true"
+         border="false"
+ background_visible="true"
+ bg_alpha_color="DkGray2"
          follows="left|top|right|bottom"
-         height="481"
-         label="Alpha"
+         height="508"
+         label="Tattoo"
          layout="topleft"
-         left_delta="0"
-         name="Alpha"
-         help_topic="customize_alpha_tab"
-         top_delta="0"
-         width="389">
+         name="Tattoo"
+         help_topic="customize_tattoo_tab"
+         width="400">
             <icon
-             follows="top|right"
+             follows="top|left"
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="315"
+             left="10"
              mouse_opaque="true"
              name="square"
-             top="4"
+             top="10"
              width="18" />
             <icon
              height="16"
              layout="topleft"
-             left_delta="-325"
+	     left="10"
              mouse_opaque="true"
-             top_delta="3"
+	     top="10"
              width="16" />
             <text
              type="string"
@@ -2897,9 +2868,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_pad="2"
+             left="31"
              name="title"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]
             </text>
@@ -2910,9 +2881,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_no_modify"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: cannot modify
             </text>
@@ -2923,9 +2894,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_loading"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: loading...
             </text>
@@ -2936,9 +2907,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_not_worn"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: not worn
             </text>
@@ -2948,9 +2919,9 @@
              follows="left|top|right"
              height="14"
              layout="topleft"
-             left="8"
+             left="10"
              name="path"
-             top="24"
+             top="36"
              width="373">
                 Located in [PATH]
             </text>
@@ -2960,22 +2931,31 @@
              follows="left|top|right"
              height="28"
              layout="topleft"
-             left_delta="-2"
+             left="10"
              name="not worn instructions"
-             top_pad="8"
+             top="31"
              word_wrap="true"
              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.
+                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>
+            <button
+             follows="left|top"
+             height="23"
+             label="Create New Tattoo"
+             label_selected="Create New Tattoo"
+             layout="topleft"
+             name="Create New"
+             top_pad="7"
+             width="160" />
             <text
              type="string"
              length="1"
              follows="left|top|right"
              height="28"
              layout="topleft"
-             left_delta="0"
+             left="10"
              name="no modify instructions"
-             top_delta="0"
+             top="31"
              word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
@@ -2983,141 +2963,60 @@
             <text
              type="string"
              length="1"
-             bottom="486"
-             follows="left|top|right"
+             bottom="4"
+             follows="left|bottom|right"
              font="SansSerif"
              halign="right"
-             height="28"
-             layout="topleft"
+             height="23"
+             layout="bottomleft"
              name="Item Action Label"
-             right="119"
+             right="132"
              width="100">
-                Alpha:
+                Tattoo:
             </text>
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
              follows="left|top"
-             height="80"
-             label="Lower Alpha"
-             layout="topleft"
-             left="8"
-             name="Lower Alpha"
-             tool_tip="Click to choose a picture"
-             top="65"
-             width="64" />
-            <check_box
-             control_name="LowerAlphaTextureInvisible"
-             follows="left"
-             height="16"
-             layout="topleft"
-             left_pad="6"
-             name="lower alpha texture invisible"
-             top_delta="4"
-             width="16" />
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="80"
-             label="Upper Alpha"
-             layout="topleft"
-             left="8"
-             name="Upper Alpha"
-             tool_tip="Click to choose a picture"
-             top="145"
-             width="64" />
-            <check_box
-             control_name="UpperAlphaTextureInvisible"
-             follows="left"
-             height="16"
-             layout="topleft"
-             left_pad="6"
-             name="upper alpha texture invisible"
-             top_delta="4"
-             width="16" />
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="80"
-             label="Head Alpha"
+             height="108"
+             label="Head Tattoo"
              layout="topleft"
-             left="8"
-             name="Head Alpha"
+             left="10"
+             name="Head Tattoo"
              tool_tip="Click to choose a picture"
-             top="225"
-             width="64" />
-            <check_box
-             control_name="HeadAlphaTextureInvisible"
-             follows="left"
-             height="16"
-             layout="topleft"
-             left_pad="6"
-             name="head alpha texture invisible"
-             top_delta="4"
-             width="16" />
+             top="66"
+             width="82" />
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
              follows="left|top"
-             height="80"
-             label="Eye Alpha"
+             height="108"
+             label="Upper Tattoo"
              layout="topleft"
-             left="8"
-             name="Eye Alpha"
+             name="Upper Tattoo"
              tool_tip="Click to choose a picture"
-             top="305"
-             width="64" />
-            <check_box
-             control_name="Eye AlphaTextureInvisible"
-             follows="left"
-             height="16"
-             layout="topleft"
-             left_pad="6"
-             name="eye alpha texture invisible"
-             top_delta="4"
-             width="16" />
+             left_delta="90"
+             width="82" />
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
              follows="left|top"
-             height="80"
-             label="Hair Alpha"
+             height="108"
+             label="Lower Tattoo"
              layout="topleft"
-             left="8"
-             name="Hair Alpha"
+             name="Lower Tattoo"
              tool_tip="Click to choose a picture"
-             top="385"
-             width="64" />
-            <check_box
-             control_name="HairAlphaTextureInvisible"
-             follows="left"
-             height="16"
-             layout="topleft"
-             left_pad="6"
-             name="hair alpha texture invisible"
-             top_delta="4"
-             width="16" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Alpha"
-             label_selected="Create New Alpha"
-             layout="topleft"
-             left="8"
-             name="Create New"
-             top="104"
-             width="160" />
+             left_delta="90"
+             width="82" />
             <button
              follows="left|top"
              height="23"
              label="Take Off"
              label_selected="Take Off"
              layout="topleft"
-             left_delta="-4"
              name="Take Off"
-             top_pad="332"
+             top_pad="4"
+             left="10"
              width="82" />
             <button
              follows="right|bottom"
@@ -3125,9 +3024,9 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             left_pad="37"
+             right="218"
              name="Save"
-             top_delta="-2"
+             top="477"
              width="82" />
             <button
              follows="right|bottom"
@@ -3135,9 +3034,9 @@
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             left_pad="6"
+             right="304"
              name="Save As"
-             top_delta="0"
+             top="477"
              width="82" />
             <button
              follows="right|bottom"
@@ -3145,38 +3044,38 @@
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             left_pad="6"
+             right="390"
              name="Revert"
-             top_delta="0"
+             top="477"
              width="82" />
         </panel>
         <panel
-         border="true"
+         border="false"
+ background_visible="true"
+ bg_alpha_color="DkGray2"
          follows="left|top|right|bottom"
-         height="481"
-         label="Tattoo"
+         height="508"
+         label="Alpha"
          layout="topleft"
-         left_delta="0"
-         name="Tattoo"
-         help_topic="customize_tattoo_tab"
-         top_delta="0"
-         width="389">
+         name="Alpha"
+         help_topic="customize_alpha_tab"
+         width="400">
             <icon
-             follows="top|right"
+             follows="top|left"
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="315"
+             left="10"
              mouse_opaque="true"
              name="square"
-             top="4"
+             top="10"
              width="18" />
             <icon
              height="16"
              layout="topleft"
-             left_delta="-325"
+	     left="10"
              mouse_opaque="true"
-             top_delta="3"
+	     top="10"
              width="16" />
             <text
              type="string"
@@ -3185,9 +3084,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_pad="2"
+             left="31"
              name="title"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]
             </text>
@@ -3198,9 +3097,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_no_modify"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: cannot modify
             </text>
@@ -3211,9 +3110,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_loading"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: loading...
             </text>
@@ -3224,9 +3123,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="31"
              name="title_not_worn"
-             top_delta="0"
+             top="10"
              width="355">
                 [DESC]: not worn
             </text>
@@ -3236,9 +3135,9 @@
              follows="left|top|right"
              height="14"
              layout="topleft"
-             left="8"
+             left="10"
              name="path"
-             top="24"
+             top="36"
              width="373">
                 Located in [PATH]
             </text>
@@ -3248,22 +3147,31 @@
              follows="left|top|right"
              height="28"
              layout="topleft"
-             left_delta="-2"
+             left="10"
              name="not worn instructions"
-             top_pad="8"
+             top="31"
              word_wrap="true"
              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.
+                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>
+            <button
+             follows="left|top"
+             height="23"
+             label="Create New Alpha"
+             label_selected="Create New Alpha"
+             layout="topleft"
+             name="Create New"
+             top_pad="18"
+             width="160" />
             <text
              type="string"
              length="1"
              follows="left|top|right"
              height="28"
              layout="topleft"
-             left_delta="0"
+             left="10"
              name="no modify instructions"
-             top_delta="0"
+             top="31"
              word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
@@ -3271,72 +3179,125 @@
             <text
              type="string"
              length="1"
-             bottom="486"
-             follows="left|top|right"
+             bottom="4"
+             follows="left|bottom|right"
              font="SansSerif"
              halign="right"
-             height="28"
-             layout="topleft"
+             height="23"
+             layout="bottomleft"
              name="Item Action Label"
-             right="119"
+             right="132"
              width="100">
-                Tattoo:
+                Alpha:
             </text>
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
              follows="left|top"
-             height="80"
-             label="Head Tattoo"
+             height="108"
+             label="Lower Alpha"
              layout="topleft"
-             left="8"
-             name="Head Tattoo"
+             left="10"
+             name="Lower Alpha"
              tool_tip="Click to choose a picture"
-             top="65"
-             width="64" />
+             top="66"
+             width="82" />
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
              follows="left|top"
-             height="80"
-             label="Upper Tattoo"
+             height="108"
+             label="Upper Alpha"
              layout="topleft"
-             left_delta="0"
-             name="Upper Tattoo"
+             name="Upper Alpha"
              tool_tip="Click to choose a picture"
-             top_delta="80"
-             width="64" />
+             left_delta="90"
+             width="82" />
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
              follows="left|top"
-             height="80"
-             label="Lower Tattoo"
+             height="108"
+             label="Head Alpha"
              layout="topleft"
-             left_delta="0"
-             name="Lower Tattoo"
+             name="Head Alpha"
              tool_tip="Click to choose a picture"
-             top_delta="80"
-             width="64" />
-            <button
+             left_delta="90"
+             width="82" />
+            <check_box
+             control_name="LowerAlphaTextureInvisible"
+             follows="left"
+             height="16"
+             layout="topleft"
+             left="43"
+             name="lower alpha texture invisible"
+             top_delta="96"
+             width="16" />
+            <check_box
+             control_name="UpperAlphaTextureInvisible"
+             follows="left"
+             height="16"
+             layout="topleft"
+             left_pad="72"
+             name="upper alpha texture invisible"
+             width="16" />
+            <check_box
+             control_name="HeadAlphaTextureInvisible"
+             follows="left"
+             height="16"
+             layout="topleft"
+             left_pad="72"
+             name="head alpha texture invisible"
+             width="16" />
+            <texture_picker
+             can_apply_immediately="true"
+             default_image_name="Default"
              follows="left|top"
-             height="23"
-             label="Create New Tattoo"
-             label_selected="Create New Tattoo"
+             height="108"
+             label="Eye Alpha"
              layout="topleft"
-             left_delta="0"
-             name="Create New"
-             top_delta="-121"
-             width="160" />
+             name="Eye Alpha"
+             tool_tip="Click to choose a picture"
+             left="10"
+             top_pad="20"
+             width="82" />
+            <texture_picker
+             can_apply_immediately="true"
+             default_image_name="Default"
+             follows="left|top"
+             height="108"
+             label="Hair Alpha"
+             layout="topleft"
+             name="Hair Alpha"
+             left_delta="90"
+             tool_tip="Click to choose a picture"
+             width="82" />
+            <check_box
+             control_name="Eye AlphaTextureInvisible"
+             follows="left"
+             height="16"
+             layout="topleft"
+             left="43"
+             name="eye alpha texture invisible"
+             top_delta="96"
+             width="16" />
+            <check_box
+             control_name="HairAlphaTextureInvisible"
+             follows="left"
+             height="16"
+             layout="topleft"
+             left_pad="72"
+             name="hair alpha texture invisible"
+             width="16" />
             <button
              follows="left|top"
              height="23"
              label="Take Off"
              label_selected="Take Off"
              layout="topleft"
-             left_delta="-4"
              name="Take Off"
-             top_pad="332"
+             left="10"
+             top_pad="20"
              width="82" />
             <button
              follows="right|bottom"
@@ -3344,9 +3305,9 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             left_pad="37"
+             right="218"
              name="Save"
-             top_delta="-2"
+             top="477"
              width="82" />
             <button
              follows="right|bottom"
@@ -3354,9 +3315,9 @@
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             left_pad="6"
+             right="304"
              name="Save As"
-             top_delta="0"
+             top="477"
              width="82" />
             <button
              follows="right|bottom"
@@ -3364,9 +3325,9 @@
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             left_pad="6"
+             right="390"
              name="Revert"
-             top_delta="0"
+             top="477"
              width="82" />
         </panel>
     </tab_container>
@@ -3377,7 +3338,7 @@
      left="211"
      mouse_opaque="false"
      name="panel_container"
-     top="116"
+     top="92"
      width="292">
         <scrolling_panel_list
          follows="left|bottom"
@@ -3385,17 +3346,18 @@
          name="panel_list" />
     </scroll_container>
     <button
-     bottom="598"
+     bottom="460"
      follows="right|left"
-     height="20"
+     height="23"
      label="Script Info"
      label_selected="Script Info"
      layout="topleft"
      name="script_info"
-     left="2"
-     width="98" />
+     tool_tip="Show scripts attached to your avatar"
+     left="13"
+     width="90" />
     <button
-     bottom="598"
+     bottom="574"
      follows="right|bottom"
      height="23"
      label="Make Outfit"
@@ -3405,7 +3367,7 @@
      right="-218"
      width="100" />
     <button
-     bottom="598"
+     bottom="574"
      follows="right|bottom"
      height="23"
      label="Cancel"
@@ -3415,7 +3377,7 @@
      right="-10"
      width="100" />
     <button
-     bottom="598"
+     bottom="574"
      follows="right|bottom"
      height="23"
      label="OK"
diff --git a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
index bda88857ae..dfd301a770 100644
--- a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
+++ b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
@@ -3,6 +3,6 @@
               border_color="ColorSwatchBorderColor"
               name="color_swatch">
   <color_swatch.caption_text name="caption"
-                             font="SansSerifSmall"
+                             halign="center"
                              follows="left|right|bottom"/>
 </color_swatch>
-- 
cgit v1.2.3