UI Fix ups

indra/newview/skins/default/textures/textures.xml

@@ -46,6 +46,9 @@ with the same filename but different name
   <texture name="Cam_Preset_Side_Off" file_name="Cam_Preset_Side_Off.png" preload="false" />
   <texture name="Cam_Preset_Side_On" file_name="Cam_Preset_Side_On.png" preload="false" />
 
+  <texture name="Conv_toolbar_plus" file_name="Conv_toolbar_plus.png" preload="false" />
+  <texture name="Conv_toolbar_sort" file_name="Conv_toolbar_sort.png" preload="false" />
+
   <texture name="icon_group.tga"/>
 
   <texture name="Favorite_Star_Active" file_name="navbar/Favorite_Star_Active.png" preload="false" />
@@ -62,6 +65,9 @@ with the same filename but different name
   <texture name="ProgressTrack" file_name="progressbar_track.tga" preload="true" scale.left="10" scale.top="7" scale.right="80" scale.bottom="7" />
   <texture name="Refresh_Off" file_name="Refresh_Off.png" preload="true" />
 
+  <texture name="Marketplace_Dropzone_Background" file_name="Marketplace_Dropzone_Background.png" preload="true" />
+  <texture name="MarketplaceBtn_Off" file_name="MarketplaceBtn_Off.png" preload="true" scale.left="30" scale.top="4" scale.right="35" scale.bottom="4" />
+  <texture name="MarketplaceBtn_Selected" file_name="MarketplaceBtn_Selected.png" preload="true" scale.left="30" scale.top="4" scale.right="35" scale.bottom="4" />
   <texture name="NoEntryLines" file_name="world/NoEntryLines.png" use_mips="true" preload="false" />
   <texture name="NoEntryPassLines" file_name="world/NoEntryPassLines.png" use_mips="true" preload="false" />
   <texture name="Rounded_Rect"	file_name="Rounded_Rect.png" preload="true" scale.left="6" scale.top="26" scale.right="58" scale.bottom="6" />

indra/newview/skins/default/xui/en-us/floater_marketplace_listings.xml

@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <floater
-  title="MARKETPLACE LISTINGS"
+  title="Marketplace Listings"
   name="floater_marketplace_listings"
   help_topic="floater_marketplace_listings"
   positioning="cascading"
   width="333"
   height="445"
-  min_width="200"
-  min_height="300"
+  min_width="333"
+  min_height="445"
   can_close="true"
   can_resize="true"
   save_rect="true"
   save_visibility="false"
+  rect_control="FloaterMarketplaceListingsRect"
   reuse_instance="true">
   <panel
     name="marketplace_listings_panel"
     follows="all"
     layout="topleft"
     left="0"
-    top="0"
+    bottom="-460"
     height="440"
     width="333">
     <panel
@@ -26,13 +27,13 @@
       left="10"
       height="440"
       width="313"
-      top="0"
+      bottom="-440"
       bg_opaque_color="InventoryBackgroundColor">
       <panel
         name="marketplace_listings_inventory_placeholder_panel"
         follows="all"
         layout="topleft"
-        top="0"
+        bottom="-440"
         left="0"
         width="313"
         height="440"
@@ -42,7 +43,7 @@
           type="string"
           follows="top|left|right"
           layout="topleft"
-          top="10"
+          bottom="-35"
           left="0"
           width="313"
           height="25"
@@ -56,7 +57,7 @@
           type="string"
           follows="top|left|right"
           layout="topleft"
-          top="35"
+          bottom="-165"
           left="0"
           width="313"
           height="130"
@@ -67,7 +68,7 @@
         name="panel_marketplace_listing"
         filename="panel_marketplace_listings.xml"
         class="llpanelmarketplacelistings"
-        top="0"
+        bottom="-440"
         follows="all"/>
       </panel>
     <panel

indra/newview/skins/default/xui/en-us/menu_viewer.xml

@@ -606,7 +606,7 @@
 			     userdata="WebLaunchJoinNow,http://secondlife.com/account/" />
 		</menu_item_call>
         <menu_item_check
-         label="Marketplace listing..."
+         label="Marketplace Listings..."
          name="MarketplaceListings">
             <on_click function="ShowFloater" userdata="marketplace_listings" />
             <on_check function="FloaterVisible" userdata="marketplace_listings" />

indra/newview/skins/default/xui/en-us/panel_marketplace_listings.xml

@@ -9,46 +9,41 @@
   <panel
     name="tool_panel"
     follows="left|top|right"
-    layout="topleft"
     height="30"
     width="308"
-    top="0"
+    bottom="-30"
     left="0">
-    <menu_button
+    <button
+      bottom="-30"
       name="sort_btn"
+      label=""
       tool_tip="View/sort options"
-      layout="topleft"
-      follows="top|left"
+      follows="bottom|top|left"
       width="31"
       height="25"
       left="2"
       menu_filename="menu_marketplace_view.xml"
-      image_hover_unselected="Toolbar_Middle_Over"
       image_overlay="Conv_toolbar_sort"
-      image_selected="Toolbar_Middle_Selected"
-      image_unselected="Toolbar_Middle_Off"
       menu_position="bottomleft"/>
     <button
       name="add_btn"
       tool_tip="Create a new listing folder"
-      layout="topleft"
-      follows="top|left"
+      follows="bottom|top|left"
       width="31"
       height="25"
-      left_pad="2"
-      image_hover_unselected="Toolbar_Middle_Over"
-      image_overlay="Conv_toolbar_plus"
-      image_selected="Toolbar_Middle_Selected"
-      image_unselected="Toolbar_Middle_Off"/>
+      bottom_delta="0"
+      left_delta="33"
+      label=""
+      image_overlay="Conv_toolbar_plus"/>
     <button
       name="audit_btn"
       label="Check for Errors"
       tool_tip="Check your marketplace listings"
-      layout="topleft"
-      follows="top|right"
-      width="97"
+      follows="bottom|top|right"
+      width="120"
       height="26"
-      left_pad="143"/>
+      bottom_delta="0"
+      left_delta="153"/>
   </panel>
   <panel
     name="tab_container_panel"
@@ -66,22 +61,25 @@
     left="0"
     max_length_chars="300"
     name="filter_editor"
-    top="0"
+    bottom="-23"
     width="308" />
   <tab_container
     name="marketplace_filter_tabs"
     follows="all"
     layout="topleft"
-    top="30"
+    bottom="-350"
     left="0"
-    top_pad="0"
     width="308"
     height="320"
     halign="center"
     tab_height="30"
     tab_group="1"
     tab_position="top"
-    tab_min_width="50">
+    tab_min_width="10">
+    <inventory_panel label="All" name="All Items" filename="panel_marketplace_listings_inventory.xml"/>
+    <inventory_panel label="Active" name="Active Items" filename="panel_marketplace_listings_listed.xml"/>
+    <inventory_panel label="Inactive" name="Inactive Items" filename="panel_marketplace_listings_unlisted.xml"/>
+    <inventory_panel label="Unassociated" name="Unassociated Items" filename="panel_marketplace_listings_unassociated.xml"/>
   </tab_container>
   </panel>
   <panel
@@ -90,7 +88,8 @@
       follows="bottom|left|right"
       left="2"
       width="306"
-      height="40"
+      bottom_delta="-35"
+      height="35"
       background_visible="true"
       background_opaque="true"
       bg_alpha_image="none"
@@ -103,7 +102,7 @@
           type="string"
           follows="bottom|left|right"
           layout="topleft"
-          top="13"
+          bottom="-30"
           height="20"
           left="2"
           width="306"
@@ -111,7 +110,7 @@
           font="SansSerifMedium"
           font_shadow="hard"
           valign="top">
-          Drop folders here to creat4e new listings
+          Drop folders here to create new listings
       </text>
   </panel>
 </panel>