Skip to content
Snippets Groups Projects
Commit 245f29ca authored by Leslie Linden's avatar Leslie Linden
Browse files

EXP-1550 FIX -- New tag shown and not removed on click when rezzing an item...

EXP-1550 FIX -- New tag shown and not removed on click when rezzing an item from Received Items panel and taking back into inventory.

* Inventory folder creation dates are now only set once, rather than being
  updated every time a new item is added.
parent b18d54be
No related branches found
No related tags found
No related merge requests found
......@@ -2146,8 +2146,14 @@ BOOL LLFolderViewFolder::addItem(LLFolderViewItem* item)
item->dirtyFilter();
// Update the folder creation date if the child is newer than our current date
setCreationDate(llmax<time_t>(mCreationDate, item->getCreationDate()));
// Update the folder creation date if the folder has no creation date
bool setting_date = false;
const time_t item_creation_date = item->getCreationDate();
if ((item_creation_date > 0) && (mCreationDate == 0))
{
setCreationDate(item_creation_date);
setting_date = true;
}
// Handle sorting
requestArrange();
......@@ -2157,8 +2163,11 @@ BOOL LLFolderViewFolder::addItem(LLFolderViewItem* item)
LLFolderViewFolder* parentp = getParentFolder();
while (parentp)
{
// Update the folder creation date if the child is newer than our current date
parentp->setCreationDate(llmax<time_t>(parentp->mCreationDate, item->getCreationDate()));
// Update the parent folder creation date
if (setting_date && (parentp->mCreationDate == 0))
{
parentp->setCreationDate(item_creation_date);
}
if (parentp->mSortFunction.isByDate())
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment