diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-05 17:44:55 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-05 17:44:55 +0200 |
| commit | 66faaf34c4a143633fc7619a4997fdfb93ceda94 (patch) | |
| tree | 0e0e89572ad817229a64b65aaac4ef6644f3852b /indra/newview/llinventorypanel.h | |
| parent | a1bcb21b3c4d1b6cb29044494648167aeeb5998b (diff) | |
| parent | a5c202dcfd1eb8240e1f03d3a9d42a360b41bab2 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llinventorypanel.h')
| -rw-r--r-- | indra/newview/llinventorypanel.h | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index 37b03dbd7d..928a458b84 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -65,10 +65,6 @@ class LLInventoryPanel : public LLPanel // Data //-------------------------------------------------------------------- public: - static const std::string DEFAULT_SORT_ORDER; - static const std::string RECENTITEMS_SORT_ORDER; - static const std::string INHERIT_SORT_ORDER; - struct Filter : public LLInitParam::Block<Filter> { Optional<U32> sort_order; @@ -142,8 +138,6 @@ public: U32 getFilterPermMask() const { return mFolders->getFilterPermissions(); } void setFilterSubString(const std::string& string); const std::string getFilterSubString() { return mFolders->getFilterSubString(); } - void setSortOrder(U32 order); - U32 getSortOrder() { return mFolders->getSortOrder(); } void setSinceLogoff(BOOL sl); void setHoursAgo(U32 hours); BOOL getSinceLogoff(); @@ -182,7 +176,6 @@ protected: LLInventoryModel* mInventory; LLInventoryObserver* mInventoryObserver; BOOL mAllowMultiSelect; - std::string mSortOrderSetting; LLFolderView* mFolders; LLScrollContainer* mScroller; @@ -196,6 +189,20 @@ protected: */ const LLInventoryFVBridgeBuilder* mInvFVBridgeBuilder; + + //-------------------------------------------------------------------- + // Sorting + //-------------------------------------------------------------------- +public: + static const std::string DEFAULT_SORT_ORDER; + static const std::string RECENTITEMS_SORT_ORDER; + static const std::string INHERIT_SORT_ORDER; + + void setSortOrder(U32 order); + U32 getSortOrder() const { return mFolders->getSortOrder(); } +private: + std::string mSortOrderSetting; + //-------------------------------------------------------------------- // Hidden folders //-------------------------------------------------------------------- |