livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

meow-7.2.2
Leyla Farazha 2011-06-20 18:17:05 -07:00
parent 658fdbb4df 941a360c46
commit 1c5584be55
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llfolderviewitem.cpp
View File

@ -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;
}

16
indra/newview/skins/default/xui/en/menu_inventory_add.xml
View File

@ -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"