merge from viewer-trunk

1 files changed, 330 insertions, 330 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml
index 01bced81d0..32460e937d 100644
--- a/indra/newview/skins/default/xui/en/floater_customize.xml
+++ b/indra/newview/skins/default/xui/en/floater_customize.xml
@@ -11,7 +11,7 @@
  save_rect="true"
  title="APPEARANCE"
  top_delta="-185"
- width="600">
+ width="524">
     <tab_container
      height="517"
      layout="topleft"
@@ -21,7 +21,7 @@
      tab_position="left"
      tab_height="50"
      top="26"
-     width="580">
+     width="506">
             <text
              type="string"
              length="1"
@@ -65,15 +65,15 @@
              mouse_opaque="true"
              width="16" />
             <button
-             follows="left|top"
+             follows="right|bottom"
              height="23"
-             label="Create New Shape"
-             label_selected="Create New Shape"
+             label="Revert"
+             label_selected="Revert"
              layout="topleft"
-             left="10"
-             name="Create New"
-             top="104"
-             width="160" />
+             right="390"
+             name="Revert"
+             top="477"
+             width="82" />
             <button
              follows="left|top"
              height="23"
@@ -280,46 +280,46 @@
              type="string"
              length="1"
              top="488"
-             follows="left|top"
+             follows="left|top|right"
              font="SansSerif"
              halign="right"
              height="23"
              layout="topleft"
-             left="10"
              name="Item Action Label"
-             width="130">
+             right="90"
+             width="100">
                 Shape:
             </text>
             <button
-             follows="left|bottom"
+             follows="left|top"
+             height="23"
+             label="Create New Shape"
+             label_selected="Create New Shape"
+             layout="topleft"
+             left="10"
+             name="Create New"
+             top="104"
+             width="160" />
+            <button
+             follows="right|bottom"
              height="23"
              label="Save"
              label_selected="Save"
              layout="topleft"
              name="Save"
-             left_pad="2"
+             right="186"
              top="477"
              width="82" />
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
              name="Save As"
              top="477"
-             left_pad="3"
+             right="304"
              width="115" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Revert"
-             label_selected="Revert"
-             layout="topleft"
-             left_pad="3"
-             name="Revert"
-             top="477"
-             width="120" />
         </panel>
         <panel
          border="false"
@@ -352,16 +352,6 @@
             <button
              follows="left|top"
              height="23"
-             label="Create New Skin"
-             label_selected="Create New Skin"
-             layout="topleft"
-             left_delta="0"
-             name="Create New"
-             top_delta="-249"
-             width="160" />
-            <button
-             follows="left|top"
-             height="23"
              label="Skin Color"
              label_selected="Skin Color"
              layout="topleft"
@@ -489,6 +479,20 @@
              width="373">
                 You do not have permission to modify this wearable.
             </text>
+            <text
+             type="string"
+             length="1"
+             top="488"
+             follows="left|top|right"
+             font="SansSerif"
+             halign="right"
+             height="23"
+             layout="topleft"
+             name="Item Action Label"
+             right="90"
+             width="100">
+                Skin:
+            </text>
             <texture_picker
              allow_no_texture="true"
              can_apply_immediately="true"
@@ -528,50 +532,46 @@
              tool_tip="Click to choose a picture"
              top_delta="102"
              width="82" />
-            <text
-             type="string"
-             length="1"
-             top="488"
+            <button
              follows="left|top"
-             font="SansSerif"
-             halign="right"
              height="23"
+             label="Create New Skin"
+             label_selected="Create New Skin"
              layout="topleft"
-             left="10"
-             name="Item Action Label"
-             width="130">
-                Skin:
-            </text>
+             left_delta="0"
+             name="Create New"
+             top_delta="-249"
+             width="160" />
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Save"
              label_selected="Save"
              layout="topleft"
-             left_pad="2"
+             right="186"
              name="Save"
              top="477"
              width="82" />
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             left_pad="3"
+             right="304"
              name="Save As"
              top="477"
              width="115" />
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             left_pad="3"
+             right="390"
              name="Revert"
              top="477"
-             width="120" />
+             width="82" />
         </panel>
         <panel
          border="false"
@@ -729,6 +729,20 @@
              width="373">
                 You do not have permission to modify this wearable.
             </text>
+            <text
+             type="string"
+             length="1"
+             top="488"
+             follows="left|top|right"
+             font="SansSerif"
+             halign="right"
+             height="23"
+             layout="topleft"
+             name="Item Action Label"
+             right="90" 
+             width="100">
+                Hair:
+            </text>
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
@@ -751,50 +765,36 @@
              name="Create New"
              top_delta="-89"
              width="160" />
-            <text
-             type="string"
-             length="1"
-             top="488"
-             follows="left|top"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="topleft"
-             name="Item Action Label"
-             left="10"
-             width="130">
-                Hair:
-            </text>
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Save"
              label_selected="Save"
              layout="topleft"
-             left_pad="2"
+             right="186"
              name="Save"
              top="477"
              width="82" />
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             left_pad="3"
+             right="304"
              name="Save As"
              top="477"
              width="115" />
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             left_pad="3"
+             right="390"
              name="Revert"
              top="477"
-             width="120" />
+             width="82" />
         </panel>
         <panel
          border="false"
@@ -914,6 +914,20 @@
              width="373">
                 You do not have permission to modify this wearable.
             </text>
+            <text
+             type="string"
+             length="1"
+             bottom="4"
+             follows="left|bottom|right"
+             font="SansSerif"
+             halign="right"
+             height="23"
+             layout="bottomleft"
+             name="Item Action Label"
+             right="90" 
+             width="100">
+                Eyes:
+            </text>
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
@@ -935,50 +949,36 @@
              name="Create New"
              top="66"
              width="160" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             name="Item Action Label"
-             left="10"
-             width="130">
-                Eyes:
-            </text>
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Save"
              label_selected="Save"
              layout="topleft"
-             left_pad="2"
+             right="186"
              name="Save"
              top="477"
              width="82" />
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             left_pad="3"
+             right="304"
              name="Save As"
              top="477"
              width="115" />
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             left_pad="3"
+             right="390"
              name="Revert"
              top="477"
-             width="120" />
+             width="82" />
         </panel>
             <text
              type="string"
@@ -1063,50 +1063,36 @@
              name="Create New"
              top="66"
              width="160" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             name="Item Action Label"
-             left="10"
-             width="130">
-                Shirt:
-            </text>
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Save"
              label_selected="Save"
              layout="topleft"
-             left_pad="2"
+             right="186"
              name="Save"
              top="477"
              width="82" />
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             left_pad="3"
+             right="304"
              name="Save As"
              top="477"
              width="115" />
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             left_pad="3"
+             right="390"
              name="Revert"
              top="477"
-             width="120" />
+             width="82" />
             <text
              type="string"
              length="1"
@@ -1197,6 +1183,20 @@
              width="373">
                 You do not have permission to modify this wearable.
             </text>
+            <text
+             type="string"
+             length="1"
+             bottom="4"
+             follows="left|bottom|right"
+             font="SansSerif"
+             halign="right"
+             height="23"
+             layout="bottomleft"
+             name="Item Action Label"
+             right="90" 
+             width="100">
+                Shirt:
+            </text>
         </panel>
         <panel
          border="false"
@@ -1266,50 +1266,36 @@
              name="Create New"
              top="66"
              width="160" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             name="Item Action Label"
-             left="10"
-             width="130">
-                Pants:
-            </text>
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Save"
              label_selected="Save"
              layout="topleft"
-             left_pad="2"
+             right="186"
              name="Save"
              top="477"
              width="82" />
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             left_pad="3"
+             right="304"
              name="Save As"
              top="477"
              width="115" />
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             left_pad="3"
+             right="390"
              name="Revert"
              top="477"
-             width="120" />
+             width="82" />
             <text
              type="string"
              length="1"
@@ -1400,6 +1386,20 @@
              width="373">
                 You do not have permission to modify this wearable.
             </text>
+            <text
+             type="string"
+             length="1"
+             bottom="4"
+             follows="left|bottom|right"
+             font="SansSerif"
+             halign="right"
+             height="23"
+             layout="bottomleft"
+             name="Item Action Label"
+             right="90" 
+             width="100">
+                Pants:
+            </text>
         </panel>
         <panel
          border="false"
@@ -1528,6 +1528,20 @@
              width="373">
                 You do not have permission to modify this wearable.
             </text>
+            <text
+             type="string"
+             length="1"
+             bottom="4"
+             follows="left|bottom|right"
+             font="SansSerif"
+             halign="right"
+             height="23"
+             layout="bottomleft"
+             name="Item Action Label"
+             right="90" 
+             width="100">
+                Shoes:
+            </text>
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
@@ -1559,50 +1573,36 @@
              name="Take Off"
              top_pad="4"
              width="82" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             left="10"
-             name="Item Action Label"
-             width="130">
-                Shoes:
-            </text>
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Save"
              label_selected="Save"
              layout="topleft"
-             left_pad="2"
+             right="186"
              name="Save"
              top="477"
              width="82" />
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             left_pad="3"
+             right="304"
              name="Save As"
              top="477"
              width="115" />
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             left_pad="3"
+             right="390"
              name="Revert"
              top="477"
-             width="120" />
+             width="82" />
         </panel>
         <panel
          border="false"
@@ -1731,6 +1731,20 @@
              width="373">
                 You do not have permission to modify this wearable.
             </text>
+            <text
+             type="string"
+             length="1"
+             bottom="4"
+             follows="left|bottom|right"
+             font="SansSerif"
+             halign="right"
+             height="23"
+             layout="bottomleft"
+             name="Item Action Label"
+             right="90" 
+             width="100">
+                Socks:
+            </text>
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
@@ -1762,50 +1776,36 @@
              name="Take Off"
              top_pad="4"
              width="82" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             left="10"
-             name="Item Action Label"
-             width="130">
-                Socks:
-            </text>
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Save"
              label_selected="Save"
              layout="topleft"
-             left_pad="2"
+             right="186"
              name="Save"
              top="477"
              width="82" />
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             left_pad="3"
+             right="304"
              name="Save As"
              top="477"
              width="115" />
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             left_pad="3"
+             right="390"
              name="Revert"
              top="477"
-             width="120" />
+             width="82" />
         </panel>
         <panel
          border="false"
@@ -1934,6 +1934,20 @@
              width="373">
                 You do not have permission to modify this wearable.
             </text>
+            <text
+             type="string"
+             length="1"
+             bottom="4"
+             follows="left|bottom|right"
+             font="SansSerif"
+             halign="right"
+             height="23"
+             layout="bottomleft"
+             name="Item Action Label"
+             right="90" 
+             width="100">
+                Jacket:
+            </text>
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
@@ -1976,50 +1990,36 @@
              name="Take Off"
              top_pad="4"
              width="82" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             left="10"
-             name="Item Action Label"
-             width="130">
-                Jacket:
-            </text>
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Save"
              label_selected="Save"
              layout="topleft"
-             left_pad="2"
+             right="186"
              name="Save"
              top="477"
              width="82" />
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             left_pad="3"
+             right="304"
              name="Save As"
              top="477"
              width="115" />
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             left_pad="3"
+             right="390"
              name="Revert"
              top="477"
-             width="120" />
+             width="82" />
         </panel>
         <panel
          border="false"
@@ -2148,6 +2148,20 @@
              width="373">
                 You do not have permission to modify this wearable.
             </text>
+            <text
+             type="string"
+             length="1"
+             bottom="4"
+             follows="left|bottom|right"
+             font="SansSerif"
+             halign="right"
+             height="23"
+             layout="bottomleft"
+             name="Item Action Label"
+             right="90" 
+             width="100">
+                Gloves:
+            </text>
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
@@ -2179,50 +2193,36 @@
              name="Take Off"
              top_pad="4"
              width="82" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             left="10"
-             name="Item Action Label"
-             width="130">
-                Gloves:
-            </text>
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Save"
              label_selected="Save"
              layout="topleft"
-             left_pad="2"
+             right="186"
              name="Save"
              top="477"
              width="82" />
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             left_pad="3"
+             right="304"
              name="Save As"
              top="477"
              width="115" />
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             left_pad="3"
+             right="390"
              name="Revert"
              top="477"
-             width="120" />
+             width="82" />
         </panel>
         <panel
          border="false"
@@ -2351,6 +2351,20 @@
              width="373">
                 You do not have permission to modify this wearable.
             </text>
+            <text
+             type="string"
+             length="1"
+             bottom="4"
+             follows="left|bottom|right"
+             font="SansSerif"
+             halign="right"
+             height="23"
+             layout="bottomleft"
+             name="Item Action Label"
+             right="90" 
+             width="100">
+                Undershirt:
+            </text>
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
@@ -2382,50 +2396,36 @@
              name="Take Off"
              top_pad="4"
              width="82" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             left="10"
-             name="Item Action Label"
-             width="130">
-                Undershirt:
-            </text>
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Save"
              label_selected="Save"
              layout="topleft"
-             left_pad="2"
+             right="186"
              name="Save"
              top="477"
              width="82" />
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             left_pad="3"
+             right="304"
              name="Save As"
              top="477"
              width="115" />
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             left_pad="3"
+             right="390"
              name="Revert"
              top="477"
-             width="120" />
+             width="82" />
         </panel>
         <panel
          border="false"
@@ -2554,6 +2554,20 @@
              width="373">
                 You do not have permission to modify this wearable.
             </text>
+            <text
+             type="string"
+             length="1"
+             bottom="4"
+             follows="left|bottom|right"
+             font="SansSerif"
+             halign="right"
+             height="23"
+             layout="bottomleft"
+             name="Item Action Label"
+             right="90" 
+             width="100">
+                Underpants:
+            </text>
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
@@ -2585,50 +2599,36 @@
              name="Take Off"
              top_pad="4"
              width="82" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             left="10"
-             name="Item Action Label"
-             width="130">
-                Underpants:
-            </text>
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Save"
              label_selected="Save"
              layout="topleft"
-             left_pad="2"
+             right="186"
              name="Save"
              top="477"
              width="82" />
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             left_pad="3"
+             right="304"
              name="Save As"
              top="477"
              width="115" />
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             left_pad="3"
+             right="390"
              name="Revert"
              top="477"
-             width="120" />
+             width="82" />
         </panel>
         <panel
          border="false"
@@ -2757,6 +2757,20 @@
              width="373">
                 You do not have permission to modify this wearable.
             </text>
+            <text
+             type="string"
+             length="1"
+             bottom="4"
+             follows="left|bottom|right"
+             font="SansSerif"
+             halign="right"
+             height="23"
+             layout="bottomleft"
+             name="Item Action Label"
+             right="90" 
+             width="100">
+                Skirt:
+            </text>
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
@@ -2788,50 +2802,36 @@
              name="Take Off"
              top_pad="4"
              width="82" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             left="10"
-             name="Item Action Label"
-             width="130">
-                Skirt:
-            </text>
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Save"
              label_selected="Save"
              layout="topleft"
-             left_pad="2"
+             right="186"
              name="Save"
              top="477"
              width="82" />
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             left_pad="3"
+             right="304"
              name="Save As"
              top="477"
              width="115" />
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             left_pad="3"
+             right="390"
              name="Revert"
              top="477"
-             width="120" />
+             width="82" />
         </panel>
         <panel
          border="false"
@@ -2960,6 +2960,20 @@
              width="373">
                 You do not have permission to modify this wearable.
             </text>
+            <text
+             type="string"
+             length="1"
+             bottom="4"
+             follows="left|bottom|right"
+             font="SansSerif"
+             halign="right"
+             height="23"
+             layout="bottomleft"
+             name="Item Action Label"
+             right="90" 
+             width="100">
+                Tattoo:
+            </text>
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
@@ -3004,50 +3018,36 @@
              top_pad="4"
              left="10"
              width="82" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             left="10"
-             name="Item Action Label"
-             width="130">
-                Tattoo:
-            </text>
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Save"
              label_selected="Save"
              layout="topleft"
-             left_pad="2"
+             right="186"
              name="Save"
              top="477"
              width="82" />
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             left_pad="3"
+             right="304"
              name="Save As"
              top="477"
              width="115" />
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             left_pad="3"
+             right="390"
              name="Revert"
              top="477"
-             width="120" />
+             width="82" />
         </panel>
         <panel
          border="false"
@@ -3176,6 +3176,20 @@
              width="373">
                 You do not have permission to modify this wearable.
             </text>
+            <text
+             type="string"
+             length="1"
+             bottom="4"
+             follows="left|bottom|right"
+             font="SansSerif"
+             halign="right"
+             height="23"
+             layout="bottomleft"
+             name="Item Action Label"
+             right="90" 
+             width="100">
+                Alpha:
+            </text>
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
@@ -3285,61 +3299,47 @@
              left="10"
              top_pad="20"
              width="82" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             left="10"
-             name="Item Action Label"
-             width="130">
-                Alpha:
-            </text>
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Save"
              label_selected="Save"
              layout="topleft"
-             left_pad="2"
+             right="186"
              name="Save"
              top="477"
              width="82" />
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Save As..."
              label_selected="Save As..."
              layout="topleft"
-             left_pad="3"
+             right="304"
              name="Save As"
              top="477"
              width="115" />
             <button
-             follows="left|bottom"
+             follows="right|bottom"
              height="23"
              label="Revert"
              label_selected="Revert"
              layout="topleft"
-             left_pad="3"
+             right="390"
              name="Revert"
              top="477"
-             width="120" />
+             width="82" />
         </panel>
     </tab_container>
     <scroll_container
      follows="left|top|right|bottom"
      height="409"
      layout="topleft"
-     left="247"
+     left="211"
      mouse_opaque="false"
      name="panel_container"
      top="92"
-     width="330">
+     width="292">
         <scrolling_panel_list
          follows="left|bottom"
          layout="topleft"
@@ -3355,7 +3355,7 @@
      name="script_info"
      tool_tip="Show scripts attached to your avatar"
      left="13"
-     width="90" ></button>
+     width="90" />
     <button
      bottom="574"
      follows="right|bottom"