Merge

1 files changed, 40 insertions, 31 deletions

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 43cf0607b5..1a68ddd7c7 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -427,15 +427,15 @@
        background_opaque="true"
        follows="all"
        halign="center"
-       height="300"
+       height="306"
        layout="topleft"
-       left="6"
+       left="7"
        name="inventory filter tabs"
        tab_height="30"
        tab_position="top"
        tab_min_width="100"
        top_pad="10"
-       width="315">
+       width="312">
         <inventory_panel
             bg_opaque_color="DkGray2"
        bg_alpha_color="DkGray2"
@@ -452,7 +452,7 @@
          name="All Items"
          sort_order_setting="InventorySortOrder"
          top="16"
-         width="290" />
+         width="288" />
         <inventory_panel
             bg_opaque_color="DkGray2"
        bg_alpha_color="DkGray2"
@@ -461,7 +461,7 @@
 	       border="false"
 	       bevel_style="none"
          follows="all"
-         height="295"
+         height="293"
          label="RECENT"
          help_topic="recent_inventory_tab"
          layout="topleft"
@@ -471,52 +471,61 @@
     </tab_container>
 
     <panel
-            bg_opaque_color="DkGray2"
-       bg_alpha_color="DkGray2"
        background_visible="true"
-       background_opaque="true"
      bevel_style="none"
      follows="left|right|bottom"
-     height="38"
+     height="27"
      layout="topleft"
-     top_pad="-1"
-     left="9"
+     top_pad="4"
+     left="10"
      name="bottom_panel"
      width="310">
         <button
          follows="bottom|left"
          tool_tip="Show additional options"
-         height="18"
-         image_disabled="OptionsMenu_Disabled"
-         image_selected="OptionsMenu_Press"
-         image_unselected="OptionsMenu_Off"
+         height="25"
+         image_hover_unselected="Toolbar_Left_Over"
+         image_overlay="OptionsMenu_Off"
+         image_selected="Toolbar_Left_Selected"
+         image_unselected="Toolbar_Left_Off"
          layout="topleft"
-         left="8"
+         left="0"
          name="options_gear_btn"
-         top="14"
-         width="18" />
+         top="1"
+         width="31" />
         <button
          follows="bottom|left"
-         height="18"
-         image_selected="AddItem_Press"
-         image_unselected="AddItem_Off"
-         image_disabled="AddItem_Disabled"
+         height="25"
+         image_hover_unselected="Toolbar_Middle_Over"
+         image_overlay="AddItem_Off"
+         image_selected="Toolbar_Middle_Selected"
+         image_unselected="Toolbar_Middle_Off"
          layout="topleft"
-         left_pad="10"
+         left_pad="1"
          name="add_btn"
          tool_tip="Add new item"
-         width="18" />
+         width="31" />
+       <icon
+        follows="bottom|left"
+        height="25"
+        image_name="Toolbar_Middle_Off"
+        layout="topleft"
+        left_pad="1"
+        name="dummy_icon"
+        width="209"
+       />
         <dnd_button
-         follows="bottom|right"
-         height="18"
-         image_selected="TrashItem_Press"
-         image_unselected="TrashItem_Off"
+         follows="bottom|left"
+         height="25"
+         image_hover_unselected="Toolbar_Right_Over"
+         image_overlay="TrashItem_Off"
+         image_selected="Toolbar_Right_Selected"
+         image_unselected="Toolbar_Right_Off"
+         left_pad="1" 
          layout="topleft"
-         right="-7"
          name="trash_btn"
          tool_tip="Remove selected item"
-         top="14"
-         width="18" />
+         width="31"/>
     </panel>