Merge of avatar-pipeline changes into viewer2

6 files changed, 1434 insertions, 537 deletions

diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 62940b87dc..8b6ab4e4d8 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -553,6 +553,16 @@
     <menu_item_separator
      layout="topleft" />
     <menu_item_call
+     label="Save As"
+     layout="topleft"
+     name="Save As">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="save_as" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_call
      label="Detach From Yourself"
      layout="topleft"
      name="Detach From Yourself">
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
new file mode 100644
index 0000000000..b07a8bb512
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu
+ layout="topleft"
+ left="0"
+ mouse_opaque="false"
+ name="menu_inventory_add"
+ visible="false">
+            <menu
+             create_jump_keys="true"
+             label="Upload"
+             layout="topleft"
+             name="upload"
+             tear_off="true">
+                <menu_item_call
+                 label="Image (L$[COST])..."
+                 layout="topleft"
+                 name="Upload Image"
+                 shortcut="control|U">
+                    <menu_item_call.on_click
+                     function="File.UploadImage"
+                     parameter="" />
+                    <menu_item_call.on_enable
+                     function="File.EnableUpload" />
+                </menu_item_call>
+                <menu_item_call
+                 label="Sound (L$[COST])..."
+                 layout="topleft"
+                 name="Upload Sound">
+                    <menu_item_call.on_click
+                     function="File.UploadSound"
+                     parameter="" />
+                    <menu_item_call.on_enable
+                     function="File.EnableUpload" />
+                </menu_item_call>
+                <menu_item_call
+                 label="Animation (L$[COST])..."
+                 layout="topleft"
+                 name="Upload Animation">
+                    <menu_item_call.on_click
+                     function="File.UploadAnim"
+                     parameter="" />
+                    <menu_item_call.on_enable
+                     function="File.EnableUpload" />
+                </menu_item_call>
+                <menu_item_call
+                 label="Bulk (L$[COST] per file)..."
+                 layout="topleft"
+                 name="Bulk Upload">
+                    <menu_item_call.on_click
+                     function="File.UploadBulk"
+                     parameter="" />
+                </menu_item_call>
+                <menu_item_separator
+                 layout="topleft" />
+            </menu>
+
+            <menu_item_call
+             label="New Folder"
+             layout="topleft"
+             name="New Folder">
+                <menu_item_call.on_click
+                 function="Inventory.DoCreate"
+                 parameter="category" />
+            </menu_item_call>
+            <menu_item_call
+             label="New Script"
+             layout="topleft"
+             name="New Script">
+                <menu_item_call.on_click
+                 function="Inventory.DoCreate"
+                 parameter="lsl" />
+            </menu_item_call>
+            <menu_item_call
+             label="New Note"
+             layout="topleft"
+             name="New Note">
+                <menu_item_call.on_click
+                 function="Inventory.DoCreate"
+                 parameter="notecard" />
+            </menu_item_call>
+            <menu_item_call
+             label="New Gesture"
+             layout="topleft"
+             name="New Gesture">
+                <menu_item_call.on_click
+                 function="Inventory.DoCreate"
+                 parameter="gesture" />
+            </menu_item_call>
+            <menu
+             height="175"
+             label="New Clothes"
+             layout="topleft"
+             left_delta="0"
+             mouse_opaque="false"
+             name="New Clothes"
+             top_pad="514"
+             width="125">
+                <menu_item_call
+                 label="New Shirt"
+                 layout="topleft"
+                 name="New Shirt">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="shirt" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Pants"
+                 layout="topleft"
+                 name="New Pants">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="pants" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Shoes"
+                 layout="topleft"
+                 name="New Shoes">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="shoes" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Socks"
+                 layout="topleft"
+                 name="New Socks">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="socks" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Jacket"
+                 layout="topleft"
+                 name="New Jacket">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="jacket" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Skirt"
+                 layout="topleft"
+                 name="New Skirt">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="skirt" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Gloves"
+                 layout="topleft"
+                 name="New Gloves">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="gloves" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Undershirt"
+                 layout="topleft"
+                 name="New Undershirt">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="undershirt" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Underpants"
+                 layout="topleft"
+                 name="New Underpants">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="underpants" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Alpha"
+                 layout="topleft"
+                 name="New Alpha">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="alpha" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Tattoo"
+                 layout="topleft"
+                 name="New Tattoo">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="tattoo" />
+                </menu_item_call>
+            </menu>
+            <menu
+             height="85"
+             label="New Body Parts"
+             layout="topleft"
+             left_delta="0"
+             mouse_opaque="false"
+             name="New Body Parts"
+             top_pad="514"
+             width="118">
+                <menu_item_call
+                 label="New Shape"
+                 layout="topleft"
+                 name="New Shape">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="shape" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Skin"
+                 layout="topleft"
+                 name="New Skin">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="skin" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Hair"
+                 layout="topleft"
+                 name="New Hair">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="hair" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Eyes"
+                 layout="topleft"
+                 name="New Eyes">
+                    <menu_item_call.on_click
+                     function="Inventory.DoCreate"
+                     parameter="eyes" />
+                </menu_item_call>
+            </menu>
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
new file mode 100644
index 0000000000..435a3e6d34
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu
+ bottom="806"
+ layout="topleft"
+ left="0"
+ mouse_opaque="false"
+ name="menu_gear_default"
+ visible="false">
+    <menu_item_call
+     label="New Inventory Window"
+     layout="topleft"
+     name="new_window">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="new_window" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_call
+     label="Sort by Name"
+     layout="topleft"
+     name="sort_by_name">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="sort_by_name" />
+    </menu_item_call>
+    <menu_item_call
+     label="Sort by Most Recent"
+     layout="topleft"
+     name="sort_by_recent">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="sort_by_recent" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_call
+     label="Show Filters"
+     layout="topleft"
+     name="show_filters">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="show_filters" />
+    </menu_item_call>
+    <menu_item_call
+     label="Reset Filters"
+     layout="topleft"
+     name="reset_filters">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="reset_filters" />
+    </menu_item_call>
+    <menu_item_call
+     label="Close All Folders"
+     layout="topleft"
+     name="close_folders">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="close_folders" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_call
+     label="Empty Trash"
+     layout="topleft"
+     name="empty_trash">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="empty_trash" />
+    </menu_item_call>
+    <menu_item_call
+     label="Empty Lost and Found"
+     layout="topleft"
+     name="empty_lostnfound">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="empty_lostnfound" />
+    </menu_item_call>
+        <menu_item_call
+         label="Save Texture As"
+         layout="topleft"
+         name="Save Texture As">
+            <on_click
+             function="Inventory.GearDefault.Custom.Action"
+             parameter="save_texture" />
+            <on_enable
+			 function="Inventory.GearDefault.Enable"
+			 parameter="save_texture" />
+        </menu_item_call>
+</menu>
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 9a3fdcc327..fcee0ef953 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -1,415 +1,467 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- background_visible="true"
- follows="all"
- height="400"
- label="Things"
- layout="topleft"
- min_height="350"
- min_width="240"
- name="inventory panel"
- width="330">
-    <panel.string
-     name="Title">
-        Things
-    </panel.string>
-    <filter_editor
-     text_pad_left="12"
-     follows="left|top|right"
-	 font="SanSerif"
-     height="20"
-     label="Filter"
-     layout="topleft"
-     left="15"
-     name="inventory search editor"
-     top="34"
-     width="300" />
-    <tab_container
-     follows="left|top|right|bottom"
-     height="300"
-     layout="topleft"
-     left_delta="-4"
-     name="inventory filter tabs"
-     tab_position="top"
-     top_pad="4"
-     width="305">
-        <inventory_panel
-         follows="left|top|right|bottom"
-         height="295"
-         label="All Items"
-         layout="topleft"
-         left="1"
-         name="All Items"
-         top="16"
-         width="290" />
-        <inventory_panel
-         follows="left|top|right|bottom"
-         height="295"
-         label="Recent Items"
-         layout="topleft"
-         left_delta="0"
-         name="Recent Items"
-         top_delta="0"
-         width="290" />
-    </tab_container>
-    <menu_bar
-     bg_visible="false"
-     follows="left|top|right"
-     height="18"
-     layout="topleft"
-     left_delta="0"
-     mouse_opaque="false"
-     name="Inventory Menu"
-     top_delta="-45"
-     width="290">
-        <menu
-         height="101"
-         label="File"
-         layout="topleft"
-         left="0"
-         mouse_opaque="false"
-         name="File"
-         tear_off="true"
-         top="-117"
-         width="128">
-            <menu_item_call
-             label="Open"
-             layout="topleft"
-             name="Open">
-                <menu_item_call.on_click
-                 function="Inventory.DoToSelected"
-                 parameter="open" />
-            </menu_item_call>
-            <menu
-             create_jump_keys="true"
-             label="Upload"
-             layout="topleft"
-             name="upload"
-             tear_off="true">
-                <menu_item_call
-                 label="Image (L$[COST])..."
-                 layout="topleft"
-                 name="Upload Image"
-                 shortcut="control|U">
-                    <menu_item_call.on_click
-                     function="File.UploadImage"
-                     parameter="" />
-                    <menu_item_call.on_enable
-                     function="File.EnableUpload" />
-                </menu_item_call>
-                <menu_item_call
-                 label="Sound (L$[COST])..."
-                 layout="topleft"
-                 name="Upload Sound">
-                    <menu_item_call.on_click
-                     function="File.UploadSound"
-                     parameter="" />
-                    <menu_item_call.on_enable
-                     function="File.EnableUpload" />
-                </menu_item_call>
-                <menu_item_call
-                 label="Animation (L$[COST])..."
-                 layout="topleft"
-                 name="Upload Animation">
-                    <menu_item_call.on_click
-                     function="File.UploadAnim"
-                     parameter="" />
-                    <menu_item_call.on_enable
-                     function="File.EnableUpload" />
-                </menu_item_call>
-                <menu_item_call
-                 label="Bulk (L$[COST] per file)..."
-                 layout="topleft"
-                 name="Bulk Upload">
-                    <menu_item_call.on_click
-                     function="File.UploadBulk"
-                     parameter="" />
-                </menu_item_call>
-                <menu_item_separator
-                 layout="topleft" />
-            </menu>
-            <menu_item_separator
-             layout="topleft" />
-            <menu_item_call
-             label="New Window"
-             layout="topleft"
-             name="New Window">
-                <menu_item_call.on_click
-                 function="Inventory.NewWindow" />
-            </menu_item_call>
-            <menu_item_separator
-             layout="topleft"
-             name="separator2" />
-            <menu_item_call
-             label="Show Filters"
-             layout="topleft"
-             name="Show Filters">
-                <menu_item_call.on_click
-                 function="Inventory.ShowFilters" />
-            </menu_item_call>
-            <menu_item_call
-             label="Reset Filters"
-             layout="topleft"
-             name="Reset Current">
-                <menu_item_call.on_click
-                 function="Inventory.ResetFilter" />
-            </menu_item_call>
-            <menu_item_call
-             label="Close All Folders"
-             layout="topleft"
-             name="Close All Folders">
-                <menu_item_call.on_click
-                 function="Inventory.CloseAllFolders" />
-            </menu_item_call>
-            <menu_item_separator
-             layout="topleft"
-             name="separator3" />
-            <menu_item_call
-             label="Empty Trash"
-             layout="topleft"
-             name="Empty Trash">
-                <menu_item_call.on_click
-                 function="Inventory.EmptyTrash" />
-            </menu_item_call>
-            <menu_item_call
-             label="Empty Lost And Found"
-             layout="topleft"
-             name="Empty Lost And Found">
-                <menu_item_call.on_click
-                 function="Inventory.EmptyLostAndFound" />
-            </menu_item_call>
-        </menu>
-        <menu
-         height="121"
-         label="Create"
-         layout="topleft"
-         left="0"
-         mouse_opaque="false"
-         name="Create"
-         tear_off="true"
-         top="-201"
-         width="121">
-            <menu_item_call
-             label="New Folder"
-             layout="topleft"
-             name="New Folder">
-                <menu_item_call.on_click
-                 function="Inventory.DoCreate"
-                 parameter="category" />
-            </menu_item_call>
-            <menu_item_call
-             label="New Script"
-             layout="topleft"
-             name="New Script">
-                <menu_item_call.on_click
-                 function="Inventory.DoCreate"
-                 parameter="lsl" />
-            </menu_item_call>
-            <menu_item_call
-             label="New Note"
-             layout="topleft"
-             name="New Note">
-                <menu_item_call.on_click
-                 function="Inventory.DoCreate"
-                 parameter="notecard" />
-            </menu_item_call>
-            <menu_item_call
-             label="New Gesture"
-             layout="topleft"
-             name="New Gesture">
-                <menu_item_call.on_click
-                 function="Inventory.DoCreate"
-                 parameter="gesture" />
-            </menu_item_call>
-            <menu
-             height="175"
-             label="New Clothes"
-             layout="topleft"
-             left_delta="0"
-             mouse_opaque="false"
-             name="New Clothes"
-             top_pad="514"
-             width="125">
-                <menu_item_call
-                 label="New Shirt"
-                 layout="topleft"
-                 name="New Shirt">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="shirt" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Pants"
-                 layout="topleft"
-                 name="New Pants">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="pants" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Shoes"
-                 layout="topleft"
-                 name="New Shoes">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="shoes" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Socks"
-                 layout="topleft"
-                 name="New Socks">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="socks" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Jacket"
-                 layout="topleft"
-                 name="New Jacket">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="jacket" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Skirt"
-                 layout="topleft"
-                 name="New Skirt">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="skirt" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Gloves"
-                 layout="topleft"
-                 name="New Gloves">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="gloves" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Undershirt"
-                 layout="topleft"
-                 name="New Undershirt">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="undershirt" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Underpants"
-                 layout="topleft"
-                 name="New Underpants">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="underpants" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Alpha"
-                 layout="topleft"
-                 name="New Alpha">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="alpha" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Tattoo"
-                 layout="topleft"
-                 name="New Tattoo">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="tattoo" />
-                </menu_item_call>
-            </menu>
-            <menu
-             height="85"
-             label="New Body Parts"
-             layout="topleft"
-             left_delta="0"
-             mouse_opaque="false"
-             name="New Body Parts"
-             top_pad="514"
-             width="118">
-                <menu_item_call
-                 label="New Shape"
-                 layout="topleft"
-                 name="New Shape">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="shape" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Skin"
-                 layout="topleft"
-                 name="New Skin">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="skin" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Hair"
-                 layout="topleft"
-                 name="New Hair">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="hair" />
-                </menu_item_call>
-                <menu_item_call
-                 label="New Eyes"
-                 layout="topleft"
-                 name="New Eyes">
-                    <menu_item_call.on_click
-                     function="Inventory.DoCreate"
-                     parameter="eyes" />
-                </menu_item_call>
-            </menu>
-        </menu>
-        <menu
-         height="49"
-         label="Sort"
-         layout="topleft"
-         left="0"
-         mouse_opaque="false"
-         name="Sort"
-         tear_off="true"
-         top="-113"
-         width="118">
-            <menu_item_check
-             control_name="Inventory.SortByName"
-             label="By Name"
-             layout="topleft"
-             name="By Name">
-                <menu_item_check.on_click
-                 function="Inventory.SetSortBy"
-                 parameter="name" />
-            </menu_item_check>
-            <menu_item_check
-             control_name="Inventory.SortByDate"
-             label="By Date"
-             layout="topleft"
-             name="By Date">
-                <menu_item_check.on_click
-                 function="Inventory.SetSortBy"
-                 parameter="date" />
-            </menu_item_check>
-            <menu_item_separator
-             layout="topleft" />
-            <menu_item_check
-             control_name="Inventory.FoldersAlwaysByName"
-             label="Folders Always By Name"
-             layout="topleft"
-             name="Folders Always By Name">
-                <menu_item_check.on_click
-                 function="Inventory.SetSortBy"
-                 parameter="foldersalwaysbyname" />
-            </menu_item_check>
-            <menu_item_check
-             control_name="Inventory.SystemFoldersToTop"
-             label="System Folders To Top"
-             layout="topleft"
-             name="System Folders To Top">
-                <menu_item_check.on_click
-                 function="Inventory.SetSortBy"
-                 parameter="systemfolderstotop" />
-            </menu_item_check>
-        </menu>
-    </menu_bar>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel

+ background_visible="true"

+ follows="all"

+ height="400"

+ label="Things"

+ layout="topleft"

+ min_height="350"

+ min_width="240"

+ name="main inventory panel"

+ width="330">

+    <panel.string

+     name="Title">

+        Things

+    </panel.string>

+    <filter_editor

+     text_pad_left="12"

+     follows="left|top|right"

+	 font="SanSerif"

+     height="20"

+     label="Filter"

+     layout="topleft"

+     left="15"

+     name="inventory search editor"

+     top="34"

+     width="300" />

+    <tab_container

+     follows="left|top|right|bottom"

+     height="300"

+     layout="topleft"

+     left_delta="-4"

+     name="inventory filter tabs"

+     tab_position="top"

+     top_pad="4"

+     width="305">

+        <inventory_panel

+         follows="left|top|right|bottom"

+         height="295"

+         label="All Items"

+         layout="topleft"

+         left="1"

+         name="All Items"

+         top="16"

+         width="290" />

+        <inventory_panel

+         follows="left|top|right|bottom"

+         height="295"

+         label="Recent Items"

+         layout="topleft"

+         left_delta="0"

+         name="Recent Items"

+         top_delta="0"

+         width="290" />

+    </tab_container>

+

+    <panel

+     background_visible="true"

+     bevel_style="none"

+     bottom="0"

+     follows="left|right|bottom"

+     height="30"

+     layout="bottomleft"

+     left="0"

+	 visible="true"

+     name="bottom_panel"

+     width="330">

+        <button

+         follows="bottom|left"

+         tool_tip="Show additional options"

+         height="18"

+         image_disabled="OptionsMenu_Disabled"

+         image_selected="OptionsMenu_Press"

+         image_unselected="OptionsMenu_Off"

+         layout="topleft"

+         left="10"

+         name="options_gear_btn"

+         picture_style="true"

+         top="6"

+         width="18" />

+        <button

+         follows="bottom|left"

+         height="18"

+         image_selected="AddItem_Press"

+         image_unselected="AddItem_Off"

+         image_disabled="AddItem_Disabled"

+         layout="topleft"

+         left_pad="5"

+         name="add_btn"

+         picture_style="true"

+         tool_tip="Add new item"

+         width="18" />

+        <dnd_button

+         follows="bottom|right"

+         height="18"

+         image_selected="TrashItem_Press"

+         image_unselected="TrashItem_Off"

+         layout="topleft"

+         right="-5"

+         name="trash_btn"

+         picture_style="true"

+         tool_tip="Remove selected item"

+         top="6"

+         width="18" />

+    </panel>

+

+    <menu_bar

+     bg_visible="false"

+     follows="left|top|right"

+     height="18"

+     layout="topleft"

+     left_delta="0"

+     mouse_opaque="false"

+     name="Inventory Menu"

+     top="15"

+	 visible="true"

+     width="290">

+        <menu

+         height="101"

+         label="File"

+         layout="topleft"

+         left="0"

+         mouse_opaque="false"

+         name="File"

+         tear_off="true"

+         top="-117"

+         width="128">

+            <menu_item_call

+             label="Open"

+             layout="topleft"

+             name="Open">

+                <menu_item_call.on_click

+                 function="Inventory.DoToSelected"

+                 parameter="open" />

+            </menu_item_call>

+            <menu

+             create_jump_keys="true"

+             label="Upload"

+             layout="topleft"

+             name="upload"

+             tear_off="true">

+                <menu_item_call

+                 label="Image (L$[COST])..."

+                 layout="topleft"

+                 name="Upload Image"

+                 shortcut="control|U">

+                    <menu_item_call.on_click

+                     function="File.UploadImage"

+                     parameter="" />

+                    <menu_item_call.on_enable

+                     function="File.EnableUpload" />

+                </menu_item_call>

+                <menu_item_call

+                 label="Sound (L$[COST])..."

+                 layout="topleft"

+                 name="Upload Sound">

+                    <menu_item_call.on_click

+                     function="File.UploadSound"

+                     parameter="" />

+                    <menu_item_call.on_enable

+                     function="File.EnableUpload" />

+                </menu_item_call>

+                <menu_item_call

+                 label="Animation (L$[COST])..."

+                 layout="topleft"

+                 name="Upload Animation">

+                    <menu_item_call.on_click

+                     function="File.UploadAnim"

+                     parameter="" />

+                    <menu_item_call.on_enable

+                     function="File.EnableUpload" />

+                </menu_item_call>

+                <menu_item_call

+                 label="Bulk (L$[COST] per file)..."

+                 layout="topleft"

+                 name="Bulk Upload">

+                    <menu_item_call.on_click

+                     function="File.UploadBulk"

+                     parameter="" />

+                </menu_item_call>

+                <menu_item_separator

+                 layout="topleft" />

+            </menu>

+            <menu_item_separator

+             layout="topleft" />

+            <menu_item_call

+             label="New Window"

+             layout="topleft"

+             name="New Window">

+                <menu_item_call.on_click

+                 function="Inventory.NewWindow" />

+            </menu_item_call>

+            <menu_item_separator

+             layout="topleft"

+             name="separator2" />

+            <menu_item_call

+             label="Show Filters"

+             layout="topleft"

+             name="Show Filters">

+                <menu_item_call.on_click

+                 function="Inventory.ShowFilters" />

+            </menu_item_call>

+            <menu_item_call

+             label="Reset Filters"

+             layout="topleft"

+             name="Reset Current">

+                <menu_item_call.on_click

+                 function="Inventory.ResetFilter" />

+            </menu_item_call>

+            <menu_item_call

+             label="Close All Folders"

+             layout="topleft"

+             name="Close All Folders">

+                <menu_item_call.on_click

+                 function="Inventory.CloseAllFolders" />

+            </menu_item_call>

+            <menu_item_separator

+             layout="topleft"

+             name="separator3" />

+            <menu_item_call

+             label="Empty Trash"

+             layout="topleft"

+             name="Empty Trash">

+                <menu_item_call.on_click

+                 function="Inventory.EmptyTrash" />

+            </menu_item_call>

+            <menu_item_call

+             label="Empty Lost And Found"

+             layout="topleft"

+             name="Empty Lost And Found">

+                <menu_item_call.on_click

+                 function="Inventory.EmptyLostAndFound" />

+            </menu_item_call>

+        </menu>

+        <menu

+         height="121"

+         label="Create"

+         layout="topleft"

+         left="0"

+         mouse_opaque="false"

+         name="Create"

+         tear_off="true"

+         top="-201"

+         width="121">

+            <menu_item_call

+             label="New Folder"

+             layout="topleft"

+             name="New Folder">

+                <menu_item_call.on_click

+                 function="Inventory.DoCreate"

+                 parameter="category" />

+            </menu_item_call>

+            <menu_item_call

+             label="New Script"

+             layout="topleft"

+             name="New Script">

+                <menu_item_call.on_click

+                 function="Inventory.DoCreate"

+                 parameter="lsl" />

+            </menu_item_call>

+            <menu_item_call

+             label="New Note"

+             layout="topleft"

+             name="New Note">

+                <menu_item_call.on_click

+                 function="Inventory.DoCreate"

+                 parameter="notecard" />

+            </menu_item_call>

+            <menu_item_call

+             label="New Gesture"

+             layout="topleft"

+             name="New Gesture">

+                <menu_item_call.on_click

+                 function="Inventory.DoCreate"

+                 parameter="gesture" />

+            </menu_item_call>

+            <menu

+             height="175"

+             label="New Clothes"

+             layout="topleft"

+             left_delta="0"

+             mouse_opaque="false"

+             name="New Clothes"

+             top_pad="514"

+             width="125">

+                <menu_item_call

+                 label="New Shirt"

+                 layout="topleft"

+                 name="New Shirt">

+                    <menu_item_call.on_click

+                     function="Inventory.DoCreate"

+                     parameter="shirt" />

+                </menu_item_call>

+                <menu_item_call

+                 label="New Pants"

+                 layout="topleft"

+                 name="New Pants">

+                    <menu_item_call.on_click

+                     function="Inventory.DoCreate"

+                     parameter="pants" />

+                </menu_item_call>

+                <menu_item_call

+                 label="New Shoes"

+                 layout="topleft"

+                 name="New Shoes">

+                    <menu_item_call.on_click

+                     function="Inventory.DoCreate"

+                     parameter="shoes" />

+                </menu_item_call>

+                <menu_item_call

+                 label="New Socks"

+                 layout="topleft"

+                 name="New Socks">

+                    <menu_item_call.on_click

+                     function="Inventory.DoCreate"

+                     parameter="socks" />

+                </menu_item_call>

+                <menu_item_call

+                 label="New Jacket"

+                 layout="topleft"

+                 name="New Jacket">

+                    <menu_item_call.on_click

+                     function="Inventory.DoCreate"

+                     parameter="jacket" />

+                </menu_item_call>

+                <menu_item_call

+                 label="New Skirt"

+                 layout="topleft"

+                 name="New Skirt">

+                    <menu_item_call.on_click

+                     function="Inventory.DoCreate"

+                     parameter="skirt" />

+                </menu_item_call>

+                <menu_item_call

+                 label="New Gloves"

+                 layout="topleft"

+                 name="New Gloves">

+                    <menu_item_call.on_click

+                     function="Inventory.DoCreate"

+                     parameter="gloves" />

+                </menu_item_call>

+                <menu_item_call

+                 label="New Undershirt"

+                 layout="topleft"

+                 name="New Undershirt">

+                    <menu_item_call.on_click

+                     function="Inventory.DoCreate"

+                     parameter="undershirt" />

+                </menu_item_call>

+                <menu_item_call

+                 label="New Underpants"

+                 layout="topleft"

+                 name="New Underpants">

+                    <menu_item_call.on_click

+                     function="Inventory.DoCreate"

+                     parameter="underpants" />

+                </menu_item_call>

+                <menu_item_call

+                 label="New Alpha"

+                 layout="topleft"

+                 name="New Alpha">

+                    <menu_item_call.on_click

+                     function="Inventory.DoCreate"

+                     parameter="alpha" />

+                </menu_item_call>

+                <menu_item_call

+                 label="New Tattoo"

+                 layout="topleft"

+                 name="New Tattoo">

+                    <menu_item_call.on_click

+                     function="Inventory.DoCreate"

+                     parameter="tattoo" />

+                </menu_item_call>

+            </menu>

+            <menu

+             height="85"

+             label="New Body Parts"

+             layout="topleft"

+             left_delta="0"

+             mouse_opaque="false"

+             name="New Body Parts"

+             top_pad="514"

+             width="118">

+                <menu_item_call

+                 label="New Shape"

+                 layout="topleft"

+                 name="New Shape">

+                    <menu_item_call.on_click

+                     function="Inventory.DoCreate"

+                     parameter="shape" />

+                </menu_item_call>

+                <menu_item_call

+                 label="New Skin"

+                 layout="topleft"

+                 name="New Skin">

+                    <menu_item_call.on_click

+                     function="Inventory.DoCreate"

+                     parameter="skin" />

+                </menu_item_call>

+                <menu_item_call

+                 label="New Hair"

+                 layout="topleft"

+                 name="New Hair">

+                    <menu_item_call.on_click

+                     function="Inventory.DoCreate"

+                     parameter="hair" />

+                </menu_item_call>

+                <menu_item_call

+                 label="New Eyes"

+                 layout="topleft"

+                 name="New Eyes">

+                    <menu_item_call.on_click

+                     function="Inventory.DoCreate"

+                     parameter="eyes" />

+                </menu_item_call>

+            </menu>

+        </menu>

+        <menu

+         height="49"

+         label="Sort"

+         layout="topleft"

+         left="0"

+         mouse_opaque="false"

+         name="Sort"

+         tear_off="true"

+         top="-113"

+         width="118">

+            <menu_item_check

+             control_name="Inventory.SortByName"

+             label="By Name"

+             layout="topleft"

+             name="By Name">

+                <menu_item_check.on_click

+                 function="Inventory.SetSortBy"

+                 parameter="name" />

+            </menu_item_check>

+            <menu_item_check

+             control_name="Inventory.SortByDate"

+             label="By Date"

+             layout="topleft"

+             name="By Date">

+                <menu_item_check.on_click

+                 function="Inventory.SetSortBy"

+                 parameter="date" />

+            </menu_item_check>

+            <menu_item_separator

+             layout="topleft" />

+            <menu_item_check

+             control_name="Inventory.FoldersAlwaysByName"

+             label="Folders Always By Name"

+             layout="topleft"

+             name="Folders Always By Name">

+                <menu_item_check.on_click

+                 function="Inventory.SetSortBy"

+                 parameter="foldersalwaysbyname" />

+            </menu_item_check>

+            <menu_item_check

+             control_name="Inventory.SystemFoldersToTop"

+             label="System Folders To Top"

+             layout="topleft"

+             name="System Folders To Top">

+                <menu_item_check.on_click

+                 function="Inventory.SetSortBy"

+                 parameter="systemfolderstotop" />

+            </menu_item_check>

+        </menu>

+    </menu_bar>

+</panel>

diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index d0c3cdfafc..cbcc3f10ad 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -1,122 +1,127 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- background_visible="true"
- follows="all"
- height="400"
- label="Things"
- layout="topleft"
- min_height="350"
- min_width="240"
- name="objects panel"
- width="333">
-    <tab_container
-     follows="all"
-     height="390"
-     layout="topleft"
-     left="9"
-     name="Inventory Tabs"
-     tab_position="top"
-     top="0"
-     width="313"
-	 tab_height="0"
-	 visible="true">
-	 <panel
-	      class="panel_main_inventory"
-		  filename="panel_main_inventory.xml"
-		  follows="all"
-		  layout="topleft"
-		  left="0"
-		  name="panel_main_inventory"
-		  top="15"
-		  label=""
-		  height="330"
-		  width="467">
-    <panel
-     height="25"
-     layout="bottomright"
-     left="0"
-     help_topic="objects_button_tab"
-     name="button_panel"
-	 bottom="0"
-     width="313">
-        <button
-         enabled="true"
-         follows="bottom|left"
-         font="SansSerifSmallBold"
-         height="25"
-         label="Info"
-         layout="topleft"
-         left="0"
-         name="info_btn"
-         top="0"
-         width="60" />
-        <button
-         enabled="true"
-         follows="bottom|left"
-         font="SansSerifSmallBold"
-         height="25"
-         label="Share"
-         layout="topleft"
-         left_pad="5"
-         name="share_btn"
-         top="0"
-         width="60" />
-        <button
-         enabled="false"
-         follows="bottom|left"
-         font="SansSerifSmallBold"
-         height="25"
-         label="Wear"
-         layout="topleft"
-         left="130"
-         name="wear_btn"
-         top="0"
-         width="60" />
-        <button
-         enabled="false"
-         follows="bottom|left"
-         font="SansSerifSmallBold"
-         height="25"
-         label="Play"
-         layout="topleft"
-         name="play_btn"
-         left="130"
-         top="0"
-         width="50" />
-        <button
-         enabled="false"
-         follows="bottom|left"
-         font="SansSerifSmallBold"
-         height="25"
-         label="Teleport"
-         layout="topleft"
-         left="130"
-         name="teleport_btn"
-         top="0"
-         width="77" />
-        <button
-         follows="bottom|right"
-         font="SansSerifSmallBold"
-         height="25"
-         label="v"
-         layout="topleft"
-         name="overflow_btn"
-         right="-10"
-         top="0"
-         width="30" />
-    </panel>
-    </panel>
-   </tab_container>
-
-    <panel
-     class="sidepanel_object_info"
-     filename="sidepanel_object_info.xml"
-     follows="all"
-     height="360"
-     layout="topleft"
-     left="0"
-     help_topic="objects_info_tab"
-     name="sidepanel_object_info"
-     top="30"
-     visible="false" />
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel

+	  background_visible="true"

+	  follows="all"

+	  height="570"

+	  label="Things"

+	  layout="topleft"

+	  min_height="350"

+	  min_width="240"

+	  name="objects panel"

+	  width="333">

+	 <panel

+		 follows="all"

+		 layout="topleft"

+		 left="0"

+		 name="sidepanel__inventory_panel"

+		 top="0"

+		 label=""

+		 height="570"

+		 visible="true"

+		 width="330">

+		<panel

+			 class="panel_main_inventory"

+			 filename="panel_main_inventory.xml"

+			 follows="all"

+			 layout="topleft"

+			 left="0"

+			 name="panel_main_inventory"

+			 top="0"

+			 label=""

+			 height="500"

+			 width="330" />

+		<panel

+			 height="25"

+			 layout="bottomright"

+			 help_topic="item_button_tab"

+			 name="button_panel"

+			 left="5"

+			 bottom="5"

+			 width="313">

+			<button

+				 enabled="true"

+				 follows="bottom|left"

+				 font="SansSerifSmallBold"

+				 height="25"

+				 label="Info"

+				 layout="topleft"

+				 left="0"

+				 name="info_btn"

+				 top="0"

+				 width="60" />

+			<button

+				 enabled="true"

+				 follows="bottom|left"

+				 font="SansSerifSmallBold"

+				 height="25"

+				 label="Share"

+				 layout="topleft"

+				 left_pad="5"

+				 name="share_btn"

+				 top="0"

+				 width="60" />

+			<button

+				 enabled="false"

+				 follows="bottom|left"

+				 font="SansSerifSmallBold"

+				 height="25"

+				 label="Wear"

+				 layout="topleft"

+				 left="130"

+				 name="wear_btn"

+				 top="0"

+				 width="60" />

+			<button

+				 enabled="false"

+				 follows="bottom|left"

+				 font="SansSerifSmallBold"

+				 height="25"

+				 label="Play"

+				 layout="topleft"

+				 name="play_btn"

+				 left="130"

+				 top="0"

+				 width="50" />

+			<button

+				 enabled="false"

+				 follows="bottom|left"

+				 font="SansSerifSmallBold"

+				 height="25"

+				 label="Teleport"

+				 layout="topleft"

+				 left="130"

+				 name="teleport_btn"

+				 top="0"

+				 width="77" />

+		</panel>

+	</panel>

+

+	<panel

+		 follows="all"

+		 layout="topleft"

+		 left="0"

+		 class="sidepanel_item_info"

+		 filename="sidepanel_item_info.xml"

+		 name="sidepanel__item_panel"

+		 top="0"

+		 label=""

+		 height="570"

+		 visible="false"

+		 width="330">

+	</panel>

+

+	<panel

+		 follows="all"

+		 layout="topleft"

+		 left="0"

+		 class="sidepanel_task_info"

+		 filename="sidepanel_task_info.xml"

+		 name="sidepanel__task_panel"

+		 top="0"

+		 label=""

+		 height="570"

+		 visible="false"

+		 width="330">

+	</panel>

+

+</panel>

diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
new file mode 100644
index 0000000000..39cd75074e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -0,0 +1,511 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel

+	 auto_tile="true"

+	 height="570"

+	 layout="topleft"

+	 name="item properties"

+	 help_topic="item_properties"

+	 save_rect="true"

+	 title="Inventory Item Properties"

+	 width="333">

+	<panel.string

+		 name="unknown">

+        (unknown)

+	</panel.string>

+	<panel.string

+		 name="public">

+        (public)

+    </panel.string>

+	<panel.string

+    	 name="you_can">

+        You can:

+    </panel.string>

+	<panel.string

+    	 name="owner_can">

+        Owner can:

+    </panel.string>

+	<panel.string

+    	 name="acquiredDate">

+        [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]

+	</panel.string>

+	<icon

+     	 follows="top|right"

+     	 height="18"

+     	 image_name="Lock"

+	     layout="topleft"

+		 right="-50"

+	     mouse_opaque="true"

+	     name="IconLocked"

+	     top="4"

+	     width="18" />

+    <button

+	     follows="top|right"

+	     height="25"

+	     image_overlay="BackArrow_Off"

+	     layout="topleft"

+	     name="back_btn"

+	     picture_style="true"

+	     right="-5"

+	     tab_stop="false"

+	     top="0"

+	     width="25" />

+	<panel

+         follows="all"

+         height="500"

+         label=""

+         layout="topleft"

+         left="5"

+         help_topic=""

+         top="30"

+		 border="1"

+         width="313">

+	    <text	 	 	 

+		     type="string"

+		     length="1"

+		     follows="left|top"

+		     height="10"

+		     layout="topleft"

+		     left="5"

+		     name="LabelItemNameTitle"

+		     top="5"

+		     width="78">

+	        Name:

+	    </text>

+    	<line_editor

+		     border_style="line"

+		     border_thickness="1"

+	    	 follows="left|top|right"

+		     height="16"

+		     layout="topleft"

+	    	 left_delta="78"

+		     max_length="63"

+		     name="LabelItemName"

+	    	 top_delta="0"

+		     width="225" />

+	    <text

+		     type="string"

+		     length="1"

+	    	 follows="left|top"

+	    	 height="10"

+		     layout="topleft"

+    		 left="5"

+		     name="LabelItemDescTitle"

+    		 top_delta="20"

+	    	 width="78">

+	        Description:

+	    </text>

+	    <line_editor

+		     border_style="line"

+    		 border_thickness="1"

+	    	 follows="left|top|right"

+	    	 height="16"

+		     layout="topleft"

+    		 left_delta="78"

+		     max_length="127"

+    		 name="LabelItemDesc"

+	    	 top_delta="0"

+	    	 width="225" />

+	    <text

+		     type="string"

+		     length="1"

+		     follows="left|top"

+		     height="16"

+		     layout="topleft"

+		     left="10"

+		     name="LabelCreatorTitle"

+		     top="65"

+		     width="78">

+	        Creator:

+    	</text>

+	    <text

+		     type="string"

+		     length="1"

+		     follows="left|top"

+		     height="16"

+		     layout="topleft"

+		     left_delta="78"

+		     name="LabelCreatorName"

+		     top_delta="0"

+		     width="200">

+	        Nicole Linden

+	     </text>

+	     <button

+			 follows="top|right"

+			 font="SansSerifSmall"

+			 height="16"

+			 label="Profile..."

+			 layout="topleft"

+			 left_delta="144"

+			 name="BtnCreator"

+			 top_delta="0"

+			 width="78" />

+	     <text

+			 type="string"

+			 length="1"

+			 follows="left|top"

+			 height="16"

+			 layout="topleft"

+			 left="10"

+			 name="LabelOwnerTitle"

+			 top="85"

+			 width="78">

+			    Owner:

+	     </text>

+	     <text

+			 type="string"

+			 length="1"

+			 follows="left|top"

+			 height="16"

+			 layout="topleft"

+			 left_delta="78"

+			 name="LabelOwnerName"

+			 top_delta="0"

+			 width="200">

+			    Thrax Linden

+	     </text>

+	     <button

+			 follows="top|right"

+			 font="SansSerifSmall"

+			 height="16"

+			 label="Profile..."

+			 layout="topleft"

+			 left_delta="144"

+			 name="BtnOwner"

+			 top_delta="0"

+			 width="78" />

+	     <text

+			 type="string"

+			 length="1"

+			 follows="left|top"

+			 height="16"

+			 layout="topleft"

+			 left="10"

+			 name="LabelAcquiredTitle"

+			 top="105"

+			 width="78">

+			Acquired:

+	     </text>

+	     <text

+			 type="string"

+			 length="1"

+			 follows="left|top"

+			 height="16"

+			 layout="topleft"

+			 left_delta="78"

+			 name="LabelAcquiredDate"

+			 top_delta="0"

+			 width="252">

+			Wed May 24 12:50:46 2006

+	    </text>

+	    <text

+			 type="string"

+			 length="1"

+			 follows="left|top"

+			 height="10"

+			 layout="topleft"

+			 left="10"

+			 name="OwnerLabel"

+			 top="125"

+			 width="78">

+			You:

+	    </text>

+	    <check_box

+			 height="16"

+			 label="Edit"

+			 layout="topleft"

+			 left_pad="5"

+			 name="CheckOwnerModify"

+			 top_delta="0"

+			 width="78" />

+	    <check_box

+			 height="16"

+			 label="Copy"

+			 layout="topleft"

+			 left_delta="0"

+			 name="CheckOwnerCopy"

+			 top_pad="5"

+			 width="88" />

+	    <check_box

+			 height="16"

+			 label="Resell"

+			 layout="topleft"

+			 left_delta="0"

+			 name="CheckOwnerTransfer"

+			 top_pad="5"

+			 width="106" />

+	    <text

+			 type="string"

+			 length="1"

+			 follows="left|top"

+			 height="10"

+			 layout="topleft"

+			 left="10"

+			 name="AnyoneLabel"

+			 top_pad="5"

+			 width="78">

+			Anyone:

+	    </text>

+	    <check_box

+			 height="16"

+			 label="Copy"

+			 layout="topleft"

+			 left_pad="5"

+			 name="CheckEveryoneCopy"

+			 top_delta="0"

+			 width="130" />

+    	<text

+			 type="string"

+			 length="1"

+			 follows="left|top"

+			 height="10"

+			 layout="topleft"

+			 left="10"

+			 name="GroupLabel"

+			 top_pad="5"

+			 width="78">

+			Group:

+    	</text>

+	    <check_box

+			 height="16"

+			 label="Share"

+			 layout="topleft"

+			 left_pad="5"

+			 name="CheckShareWithGroup"

+			 top_delta="5"

+			 width="106" />

+	    <text

+			 type="string"

+			 length="1"

+			 follows="left|top"

+			 height="10"

+			 layout="topleft"

+			 left="10"

+			 name="NextOwnerLabel"

+			 top_pad="5"

+			 width="78">

+			Next owner:

+	    </text>

+	    <check_box

+			 height="16"

+			 label="Edit"

+			 layout="topleft"

+			 left_pad="5"

+			 name="CheckNextOwnerModify"

+			 top_delta="0"

+			 width="78" />

+	    <check_box

+			 height="16"

+			 label="Copy"

+			 layout="topleft"

+			 left_delta="0"

+			 name="CheckNextOwnerCopy"

+			 top_pad="5"

+			 width="88" />

+	    <check_box

+			 height="16"

+			 label="Resell"

+			 layout="topleft"

+			 left_delta="0"

+			 name="CheckNextOwnerTransfer"

+			 top_pad="5"

+			 width="106" />

+	    <check_box

+			 height="16"

+			 label="For Sale"

+			 layout="topleft"

+			 left="10"

+			 name="CheckPurchase"

+			 top_pad="5"

+			 width="78" />

+		<combo_box

+			 height="19"

+			 left_pad="5"

+			 layout="topleft"

+			 follows="left|top"

+			 name="combobox sale copy"

+			 width="90">

+			<combo_box.item

+			     label="Copy"

+			     name="Copy"

+			     value="Copy" />

+			<combo_box.item

+			     label="Original"

+			     name="Original"

+			     value="Original" />

+	    </combo_box>

+	    <spinner

+			    follows="left|top"

+			    decimal_digits="0"

+			    increment="1"

+			    control_name="Edit Cost"

+			    name="Edit Cost"

+			    label="Price: L$"

+			    label_width="60"

+			    left="10"

+			    width="180"

+			    min_val="1"

+			    height="19"

+			    max_val="999999999"

+			    top_pad="5"/>

+	    <!--line_editor

+			 border_style="line"

+			 border_thickness="1"

+			 follows="left|top|right"

+			 height="16"

+			 layout="topleft"

+			 left_pad="5"

+			 max_length="25"

+			 name="EditPrice"

+			 top_delta="0"

+			 width="242" /-->

+	    <!--text

+			 type="string"

+			 length="1"

+			 follows="left|top"

+			 height="10"

+			 layout="topleft"

+			 left="10"

+			 name="BaseMaskDebug"

+			 top="155"

+			 width="330">

+			B:

+	    </text>

+	    <text

+			 type="string"

+			 length="1"

+			 follows="left|top"

+			 height="10"

+			 layout="topleft"

+			 left_delta="60"

+			 name="OwnerMaskDebug"

+			 top_delta="0"

+			 width="270">

+			O:

+	    </text>

+	    <text

+			 type="string"

+			 length="1"

+			 follows="left|top"

+			 height="10"

+			 layout="topleft"

+			 left_delta="60"

+			 name="GroupMaskDebug"

+			 top_delta="0"

+			 width="210">

+			G:

+	    </text>

+	    <text

+			 type="string"

+			 length="1"

+			 follows="left|top"

+			 height="10"

+			 layout="topleft"

+			 left_delta="60"

+			 name="EveryoneMaskDebug"

+			 top_delta="0"

+			 width="150">

+			E:

+	    </text>

+	    <text

+			 type="string"

+			 length="1"

+			 follows="left|top"

+			 height="10"

+			 layout="topleft"

+			 left_delta="60"

+			 name="NextMaskDebug"

+			 top_delta="0"

+			 width="90">

+			N:

+	    </text-->

+			    <!--text

+			 type="string"

+			 length="1"

+			 follows="left|top"

+			 height="10"

+			 layout="topleft"

+			 left="10"

+			 name="SaleLabel"

+			 top_pad="5"

+			 width="330">

+			Mark Item:

+	    </text-->

+	    <!--radio_group

+			 draw_border="false"

+			 follows="left|top|right"

+			 height="16"

+			 layout="topleft"

+			 left_delta="78"

+			 name="RadioSaleType"

+			 top_delta="0"

+			 width="252">

+			    <radio_item

+			     height="16"

+			     label="Original"

+			     layout="topleft"

+			     left="0"

+			     name="radio"

+			     top="0"

+			     width="70" />

+			    <radio_item

+			     height="16"

+			     label="Copy"

+			     layout="topleft"

+			     left_delta="60"

+			     name="radio2"

+			     top_delta="0"

+			     width="70" />

+	    </radio_group-->

+	    <!--text

+			 type="string"

+			 length="1"

+			 follows="left|top"

+			 height="16"

+			 layout="topleft"

+			 left="10"

+			 name="TextPrice"

+			 top_pad="5"

+			 width="78">

+			Price: L$

+	    </text-->

+	</panel>

+    <panel

+		 height="25"

+		 layout="bottomright"

+		 help_topic="button_tab"

+		 name="button_panel"

+		 left="5"

+		 bottom="5"

+		 width="313">

+	    <button

+		     follows="bottom|left"

+		     font="SansSerifSmallBold"

+		     height="25"

+		     label="Edit"

+		     layout="topleft"

+		     left="0"

+		     name="edit_btn"

+		     top="0"

+		     width="50" />

+	    <button

+		     follows="bottom|right"

+		     font="SansSerifSmallBold"

+		     height="25"

+		     label="Cancel"

+		     layout="topleft"

+		     name="cancel_btn"

+		     right="-1"

+		     top="0"

+		     width="70" />

+	    <button

+		     follows="bottom|right"

+		     font="SansSerifSmallBold"

+		     height="25"

+		     label="Save"

+		     layout="topleft"

+		     name="save_btn"

+		     left_pad="-135"

+		     top="0"

+		     width="60" />

+	</panel>

+</panel>