diff options
author | Oz Linden <oz@lindenlab.com> | 2011-05-11 13:47:12 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-05-11 13:47:12 -0400 |
commit | 353d2059fc33174010127863a25983b918115361 (patch) | |
tree | f2e08370b140352957b4d7757e59e0fe673f5a14 /indra/newview/llfolderview.cpp | |
parent | 7610c0c050a84ebdf08b8e206eb7fe5e190dedb2 (diff) | |
parent | d86eb3dd42d39e6b7647b6680100aeafe2173d36 (diff) |
merge up to latest viewer-development
Diffstat (limited to 'indra/newview/llfolderview.cpp')
-rw-r--r-- | indra/newview/llfolderview.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index b3b1ce5743..3884b94b60 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -301,18 +301,6 @@ BOOL LLFolderView::canFocusChildren() const return FALSE; } -void LLFolderView::checkTreeResortForModelChanged() -{ - if (mSortOrder & LLInventoryFilter::SO_DATE && !(mSortOrder & LLInventoryFilter::SO_FOLDERS_BY_NAME)) - { - // This is the case where something got added or removed. If we are date sorting - // everything including folders, then we need to rebuild the whole tree. - // Just set to something not SO_DATE to force the folder most resent date resort. - mSortOrder = mSortOrder & ~LLInventoryFilter::SO_DATE; - setSortOrder(mSortOrder | LLInventoryFilter::SO_DATE); - } -} - static LLFastTimer::DeclareTimer FTM_SORT("Sort Inventory"); void LLFolderView::setSortOrder(U32 order) |