diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-09-04 13:15:48 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-09-04 13:15:48 -0400 |
| commit | aafc82668073e26e8c8a951a96bff9b1d1993262 (patch) | |
| tree | 1972c12ee782ff3635c07ee89f09f0215f55a969 /indra/newview/llfolderviewmodelinventory.h | |
| parent | c9af158e36eae83f6e3eba97762369affa84848b (diff) | |
| parent | 1be63209331d509396bd7ee79302d511fe83d72e (diff) | |
merge changes for 3.8.3-release
Diffstat (limited to 'indra/newview/llfolderviewmodelinventory.h')
| -rwxr-xr-x | indra/newview/llfolderviewmodelinventory.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfolderviewmodelinventory.h b/indra/newview/llfolderviewmodelinventory.h index 8772185ad0..0516fc3b4b 100755 --- a/indra/newview/llfolderviewmodelinventory.h +++ b/indra/newview/llfolderviewmodelinventory.h @@ -89,6 +89,7 @@ public: mByDate = (mSortOrder & LLInventoryFilter::SO_DATE); mSystemToTop = (mSortOrder & LLInventoryFilter::SO_SYSTEM_FOLDERS_TO_TOP); mFoldersByName = (mSortOrder & LLInventoryFilter::SO_FOLDERS_BY_NAME); + mFoldersByWeight = (mSortOrder & LLInventoryFilter::SO_FOLDERS_BY_WEIGHT); } bool operator()(const LLFolderViewModelItemInventory* const& a, const LLFolderViewModelItemInventory* const& b) const; @@ -97,6 +98,7 @@ private: bool mByDate; bool mSystemToTop; bool mFoldersByName; + bool mFoldersByWeight; }; class LLFolderViewModelInventory |