diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-06-20 18:17:05 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-06-20 18:17:05 -0700 |
| commit | 1c5584be5544539ece5c08ab0018bd35fcaae983 (patch) | |
| tree | a9898b2ddab0ab586415b4bb868040c6a84d80a2 /indra | |
| parent | 658fdbb4df40207c67b4cfa6d911e41af9545efa (diff) | |
| parent | 941a360c465a902a083bbab3da176351331428b5 (diff) | |
merge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfolderviewitem.cpp | 14 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_inventory_add.xml | 16 |
2 files changed, 14 insertions, 16 deletions
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; } 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 @@ -92,22 +92,6 @@ 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" name="New Script"> |