From f8907b327bb0009047b9cef54fde3d7dc6e8d6ca Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 25 May 2011 11:17:47 -0700
Subject: hooking up marketplace inbox to inventory

---
 indra/newview/skins/default/textures/textures.xml  |   2 +-
 .../textures/widgets/MarketplaceBtn_Off.png        | Bin 711 -> 1067 bytes
 .../textures/widgets/MarketplaceBtn_Selected.png   | Bin 702 -> 1086 bytes
 .../skins/default/xui/en/sidepanel_inventory.xml   |  32 ++++++++++++++-------
 4 files changed, 22 insertions(+), 12 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 4f19dd9a6d..ec12d996bf 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -250,7 +250,7 @@ with the same filename but different name
   <texture name="Locked_Icon" file_name="icons/Locked_Icon.png" preload="false" />
 
   <texture name="MarketplaceBtn_Off" file_name="widgets/MarketplaceBtn_Off.png" preload="true" scale.left="30" scale.top="19" scale.right="35" scale.bottom="4" />
-  <texture name="MarketplaceBtn_Selected" file_name="widgets/MarketplaceBtn_Selected.png" preload="true" scale.left="22" scale.top="16" scale.right="26" scale.bottom="7" />
+  <texture name="MarketplaceBtn_Selected" file_name="widgets/MarketplaceBtn_Selected.png" preload="true" scale.left="30" scale.top="19" scale.right="35" scale.bottom="4" />
 
   <texture name="Microphone_On" file_name="icons/Microphone_On.png" preload="false" />
 
diff --git a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png
index e291a1c508..e603c44384 100644
Binary files a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png and b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png differ
diff --git a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png
index 33527f852b..fbc164123f 100644
Binary files a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png and b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png differ
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index a0caf80256..7663db2756 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -53,7 +53,7 @@
                  max_dim="125"
                  height="35">
                  <panel
-                      follows="top|left|right"
+                      follows="all"
                       layout="topleft"
                       left="0"
                       name="marketplace_inbox"
@@ -79,18 +79,28 @@
                          ></button>
                          <panel
                              follows="all"
-                             left="0"
+                             left="10"
                              height="90"
-                             width="250"
-                             top="30"
+                             width="330"
+                             top="35"
                            >
-                             <text
-                                 left ="40"
-                                 top="15"
-                                 align="left"
-                                 height="14"
-                                 width="100"
-                                 >Just a panel</text>    
+                             <inventory_panel
+                                bg_opaque_color="DkGray2"
+                                bg_alpha_color="DkGray2"
+                                background_visible="true"
+                                background_opaque="true"
+                                border="false"
+                                bevel_style="none"
+                                follows="all"
+                                height="90"
+                                start_folder="Inbox"
+                                layout="topleft"
+                                left="0"
+                                name="All Items"
+                                sort_order_setting="InventorySortOrder"
+                                show_item_link_overlays="true"
+                                top="0"
+                                width="308" />   
                          </panel>
                      
                  </panel>
-- 
cgit v1.2.3