diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-02-28 22:02:26 +0200 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-02-28 22:02:26 +0200 |
commit | 7f315b1552dd01e0ee2ff58e84f1fc87fa675cdf (patch) | |
tree | b48d3f2d1e5b27ad6edd3263411f364e6ceb2428 /indra/newview/llfolderviewmodelinventory.h | |
parent | 31a074c3c41cd96f9656ec7510c6eff7ebec440e (diff) | |
parent | 6ca09a94554ec01f5c94ec60fffd01d7e33f3546 (diff) |
Merge branch 'master' into DRTVWR-486
Diffstat (limited to 'indra/newview/llfolderviewmodelinventory.h')
-rw-r--r-- | indra/newview/llfolderviewmodelinventory.h | 4 |
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) |