From 4415c8505fd5c2bb0af6ec1324cee3d1ef6e8c78 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Mon, 30 May 2011 16:42:24 -0700
Subject: Adding the outbox

---
 indra/llcommon/llfoldertype.cpp                    |  1 +
 indra/llcommon/llfoldertype.h                      |  3 +-
 indra/newview/llviewerfoldertype.cpp               |  1 +
 .../skins/default/xui/en/sidepanel_inventory.xml   | 32 ++++++++++++++--------
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/indra/llcommon/llfoldertype.cpp b/indra/llcommon/llfoldertype.cpp
index ebc79af412..f5b3883f43 100644
--- a/indra/llcommon/llfoldertype.cpp
+++ b/indra/llcommon/llfoldertype.cpp
@@ -90,6 +90,7 @@ LLFolderDictionary::LLFolderDictionary()
 	addEntry(LLFolderType::FT_OUTFIT, 				new FolderEntry("outfit",	FALSE));
 	addEntry(LLFolderType::FT_MY_OUTFITS, 			new FolderEntry("my_otfts",	TRUE));
 	addEntry(LLFolderType::FT_INBOX, 				new FolderEntry("inbox",	TRUE));
+	addEntry(LLFolderType::FT_OUTBOX, 				new FolderEntry("outbox",	TRUE));
 		 
 	addEntry(LLFolderType::FT_NONE, 				new FolderEntry("-1",		FALSE));
 };
diff --git a/indra/llcommon/llfoldertype.h b/indra/llcommon/llfoldertype.h
index 936fbed17d..71e9338883 100644
--- a/indra/llcommon/llfoldertype.h
+++ b/indra/llcommon/llfoldertype.h
@@ -81,8 +81,9 @@ public:
 		FT_MY_OUTFITS = 48,
 		
 		FT_INBOX = 49,
+		FT_OUTBOX = 50,
 
-		FT_COUNT = 50,
+		FT_COUNT = 51,
 
 		FT_NONE = -1
 	};
diff --git a/indra/newview/llviewerfoldertype.cpp b/indra/newview/llviewerfoldertype.cpp
index 1623357c90..7e0e510c07 100644
--- a/indra/newview/llviewerfoldertype.cpp
+++ b/indra/newview/llviewerfoldertype.cpp
@@ -131,6 +131,7 @@ LLViewerFolderDictionary::LLViewerFolderDictionary()
 	addEntry(LLFolderType::FT_OUTFIT, 				new ViewerFolderEntry("New Outfit",				"Inv_LookFolderOpen",	"Inv_LookFolderClosed",	TRUE));
 	addEntry(LLFolderType::FT_MY_OUTFITS, 			new ViewerFolderEntry("My Outfits",				"Inv_SysOpen",			"Inv_SysClosed",		TRUE));
 	addEntry(LLFolderType::FT_INBOX, 				new ViewerFolderEntry("Inbox",					"Inv_SysOpen",			"Inv_SysClosed",		FALSE, true));
+	addEntry(LLFolderType::FT_OUTBOX, 				new ViewerFolderEntry("Outbox",					"Inv_SysOpen",			"Inv_SysClosed",		FALSE, true));
 		 
 	addEntry(LLFolderType::FT_NONE, 				new ViewerFolderEntry("New Folder",				"Inv_FolderOpen",		"Inv_FolderClosed",		FALSE, false, "default"));
 
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index fa79975669..5f90a74e74 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -96,7 +96,7 @@
                                 start_folder="Inbox"
                                 layout="topleft"
                                 left="0"
-                                name="All Items"
+                                name="inventory_inbox"
                                 sort_order_setting="InventorySortOrder"
                                 show_item_link_overlays="true"
                                 top="0"
@@ -114,7 +114,7 @@
                  max_dim="125"
   height="35">
                  <panel
-                      follows="top|left|right"
+                      follows="all"
                       layout="topleft"
                       left="10"
                       name="marketplace_outbox"
@@ -153,16 +153,26 @@
                          follows="all"
                          left="0"
                          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="Outbox"
+                              layout="topleft"
+                              left="0"
+                              name="inventory_outbox"
+                              sort_order_setting="InventorySortOrder"
+                              show_item_link_overlays="true"
+                              top="0"
+                              width="308" />
                      </panel>
 
                  </panel>
-- 
cgit v1.2.3