EXP-919 FIX -- Items not shown in Received Items panel

EXP-929 FIX -- First Direct Delivery item purchased while logged in: Received Items folder visible in inventory and item not visible in Received items panel - no badge count update

* Inbox and Outbox inventory panels now live in their own XML files and are hot loaded into place when appropriate, like when the "Received Items" folder is first created, for example.
* The Inbox and Outbox panels now show relevant default messages when the folders are empty or do not exist
* Added LLInventoryCategoryAddedObserver, a new inventory observer type to observe added folders
* Hacked LLInventoryPanel to properly set up inbox and outbox inventory views for the "Received Items" folder and the "Merchant Outbox" folder that aren't created with the proper system folder type
* Changed inventory badge count computation to use LLFolderView rather than the inventory directly
* Applied various focus, selection and other inbox fixes to the outbox

Reviewed by Richard.

4 files changed, 73 insertions, 48 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
new file mode 100644
index 0000000000..49abbcde71
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inventory_panel
+    name="inventory_inbox"
+    start_folder="Inbox"
+    follows="all" layout="topleft"
+    top="0" left="0" height="165" width="308"
+	top_pad="0"
+    bg_opaque_color="DkGray2"
+    bg_alpha_color="DkGray2"
+    background_visible="true"
+    background_opaque="true"
+    border="false"
+    bevel_style="none"
+    show_item_link_overlays="true"
+    >
+    <scroll reserve_scroll_corner="false" />
+</inventory_panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml
new file mode 100644
index 0000000000..af32056428
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inventory_panel
+    name="inventory_outbox"
+    start_folder="Outbox"
+    follows="all" layout="topleft"
+    top="0" left="0" height="165" width="308"
+	top_pad="0"
+    bg_opaque_color="DkGray2"
+    bg_alpha_color="DkGray2"
+    background_visible="true"
+    background_opaque="true"
+    border="false"
+    bevel_style="none"
+    show_item_link_overlays="true"
+    >
+    <scroll reserve_scroll_corner="false" />
+</inventory_panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 778daac83b..baf37ae0b4 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -69,7 +69,6 @@
                       width="330">
                      <string name="InboxLabelWithArg">Received Items ([NUM])</string>
                      <string name="InboxLabelNoArg">Received Items</string>
-					 <string name="InboxNoItems">Items purchased through the marketplace will be delivered here.</string>
                      <button
                         label="Received Items"
                         name="inbox_btn"
@@ -112,26 +111,19 @@
                         background_opaque="true"
                         tool_tip="Drag and drop items to your inventory to manage and use them"
                         >
-                        <inventory_panel
-                            bg_opaque_color="DkGray2"
-                            bg_alpha_color="DkGray2"
-                            background_visible="true"
-                            background_opaque="true"
-                            border="false"
-                            bevel_style="none"
-                            follows="all"
-                            top="0"
-                            height="165"
-                            start_folder="Inbox"
-                            layout="topleft"
-                            left="0"
-                            name="inventory_inbox"
-                            sort_order_setting="InventorySortOrder"
-                            show_item_link_overlays="true"
-                            top_pad="0"
-                            width="308">
-                            <scroll reserve_scroll_corner="false" />
-                        </inventory_panel>
+                        <text
+							name="inbox_inventory_placeholder"
+							type="string"
+							follows="all"
+							layout="topleft"
+							top="0"
+							left="0"
+							width="308"
+							height="165"
+							wrap="true"
+							halign="center">
+							Purchases from the marketplace will be delivered here.
+						</text>
                     </panel>
                  </panel>
              </layout_panel>
@@ -211,33 +203,30 @@
                          </images>
                      </loading_indicator>
                      <panel
-                         follows="all"
-                         left="0"
-                         bottom="200"
-                         width="330"
-                         top="35"
-                           >
-                         <inventory_panel
-                              bg_opaque_color="DkGray2"
-                              bg_alpha_color="DkGray2"
-                              background_visible="true"
-                              background_opaque="true"
-                              border="false"
-                              bevel_style="none"
-                              follows="all"
-                              height="165"
-                              start_folder="Outbox"
-                              layout="topleft"
-                              left="0"
-                              name="inventory_outbox"
-                              sort_order_setting="InventorySortOrder"
-                              show_item_link_overlays="true"
-                              top="0"
-                              width="308">
-                             <scroll reserve_scroll_corner="false" />
-                         </inventory_panel>
-                     </panel>
-
+                        follows="all"
+                        left="10"
+                        bottom="200"
+                        width="308"
+                        top="35"
+                        bg_opaque_color="InventoryBackgroundColor"
+                        background_visible="true"
+                        background_opaque="true"
+                        tool_tip="Drag and drop items here to prepare them for sale on your storefront"
+                        >
+                        <text
+							name="outbox_inventory_placeholder"
+							type="string"
+							follows="all"
+							layout="topleft"
+							top="0"
+							left="0"
+							width="308"
+							height="165"
+							wrap="true"
+							halign="center">
+							Set up your merchant account to use this feature.
+						</text>
+                    </panel>
                  </panel>
              </layout_panel>
          </layout_stack>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 71f48c833d..2fa7b9f796 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2021,6 +2021,8 @@ Returns a string with the requested data about the region
 	<string name="PlacesNoMatchingItems">Didn't find what you're looking for? Try [secondlife:///app/search/places/[SEARCH_TERM] Search].</string>
 	<string name="FavoritesNoMatchingItems">Drag a landmark here to add it to your favorites.</string>
 	<string name="InventoryNoTexture">You do not have a copy of this texture in your inventory</string>
+	<string name="InventoryInboxNoItems">Items purchased through the marketplace will be delivered here.</string>
+	<string name="InventoryOutboxNoItems">Drag items here in preparation for listing on your marketplace storefront.</string>
     <!-- use value="" because they have preceding spaces -->
 	<string name="no_transfer" value=" (no transfer)" />
 	<string name="no_modify"   value=" (no modify)" />