summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderviewmodelinventory.h
diff options
context:
space:
mode:
authorNicky <nicky.dasmijn@gmail.com>2022-02-28 22:04:05 +0100
committerNicky <nicky.dasmijn@gmail.com>2022-02-28 22:04:05 +0100
commit43031968a653899f62755b6d7b7e28b7fedc24d9 (patch)
treec610012c5d4e568d94dea4208a80fe1be53ff2bf /indra/newview/llfolderviewmodelinventory.h
parent07d7dcc0be9b793b1bcef63f526b441a58a9b764 (diff)
parent6ca09a94554ec01f5c94ec60fffd01d7e33f3546 (diff)
Merge remote-tracking branch 'll/master'
Diffstat (limited to 'indra/newview/llfolderviewmodelinventory.h')
-rw-r--r--indra/newview/llfolderviewmodelinventory.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llfolderviewmodelinventory.h b/indra/newview/llfolderviewmodelinventory.h
index 51b98339c4..de28091c32 100644
--- a/indra/newview/llfolderviewmodelinventory.h
+++ b/indra/newview/llfolderviewmodelinventory.h
@@ -47,6 +47,7 @@ public:
virtual BOOL isItemInTrash( void) const { return FALSE; } // TODO: make into pure virtual.
virtual BOOL isAgentInventory() const { return FALSE; }
virtual BOOL isUpToDate() const = 0;
+ virtual void addChild(LLFolderViewModelItem* child);
virtual bool hasChildren() const = 0;
virtual LLInventoryType::EType getInventoryType() const = 0;
virtual void performAction(LLInventoryModel* model, std::string action) = 0;
@@ -63,6 +64,7 @@ public:
virtual LLToolDragAndDrop::ESource getDragSource() const = 0;
protected:
bool mPrevPassedAllFilters;
+ time_t mLastAddedChildCreationDate; // -1 if nothing was added
};
class LLInventorySort
@@ -83,6 +85,8 @@ public:
}
bool isByDate() const { return mByDate; }
+ bool isFoldersByName() const { return (!mByDate || mFoldersByName) && !mFoldersByWeight; }
+ bool isFoldersByDate() const { return mByDate && !mFoldersByName && !mFoldersByWeight; }
U32 getSortOrder() const { return mSortOrder; }
void toParams(Params& p) { p.order(mSortOrder);}
void fromParams(Params& p)