diff options
author | callum_linden <none@none> | 2015-08-04 15:47:37 -0700 |
---|---|---|
committer | callum_linden <none@none> | 2015-08-04 15:47:37 -0700 |
commit | 230bc8614765c0973fb91bca68238b9abcd12adf (patch) | |
tree | 8ccde7ba65ba2eb2d964c9e44e4a2ad6653111b2 /indra/newview/llfolderviewmodelinventory.h | |
parent | a75a4e2a4f0b8bc65aa45368326fce0e6635c4ac (diff) | |
parent | 310ec101dfd2c69ecc1a51d0a3a8ea12d5fdaf7a (diff) |
Merge with viewer 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 |