From 5af57330eb23dd6f00f02bafdf08ee70b5cae50b Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Mon, 20 Jun 2011 08:57:57 -0700
Subject: EXP-917 FIX -- Inbox and Outbox options shown in the + Menu in the
 Inventory Panel

Oops.
---
 .../newview/skins/default/xui/en/menu_inventory_add.xml  | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
index f38ea04858..e0ccb18c08 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -91,22 +91,6 @@
                  function="Inventory.DoCreate"
                  parameter="category" />
             </menu_item_call>
-            <menu_item_call
-                    label="Inbox"
-                   layout="topleft"
-                    name="Inbox">
-               <menu_item_call.on_click
-     function="Inventory.DoCreate"
-     parameter="inbox" />
-</menu_item_call>
-           <menu_item_call
-                 label="Outbox"
-                 layout="topleft"
-                 name="Outbox">
-             <menu_item_call.on_click
-     function="Inventory.DoCreate"
-     parameter="outbox" />
-</menu_item_call>
             <menu_item_call
              label="New Script"
              layout="topleft"
-- 
cgit v1.2.3


From 941a360c465a902a083bbab3da176351331428b5 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 20 Jun 2011 18:03:58 -0700
Subject: EXP-893 FIX Single order purchases not sorted with most recent item
 delivered at top of list reviewed by Leyla

---
 indra/newview/llfolderviewitem.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp
index 57e5488a4e..85791774d7 100644
--- a/indra/newview/llfolderviewitem.cpp
+++ b/indra/newview/llfolderviewitem.cpp
@@ -1985,6 +1985,13 @@ BOOL LLFolderViewFolder::addItem(LLFolderViewItem* item)
 	item->dirtyFilter();
 	requestArrange();
 	requestSort();
+	LLFolderViewFolder* parentp = getParentFolder();
+	while (parentp && !parentp->getCreationDate())
+	{
+		// parent folder doesn't have a time stamp yet, so get it from us
+		parentp->requestSort();
+		parentp = parentp->getParentFolder();
+	}
 	return TRUE;
 }
 
@@ -2004,6 +2011,13 @@ BOOL LLFolderViewFolder::addFolder(LLFolderViewFolder* folder)
 	// rearrange all descendants too, as our indentation level might have changed
 	folder->requestArrange(TRUE);
 	requestSort();
+	LLFolderViewFolder* parentp = getParentFolder();
+	while (parentp && !parentp->getCreationDate())
+	{
+		// parent folder doesn't have a time stamp yet, so get it from us
+		parentp->requestSort();
+		parentp = parentp->getParentFolder();
+	}
 	return TRUE;
 }
 
-- 
cgit v1.2.3