diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-05-04 11:17:19 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-05-04 11:17:19 -0700 |
| commit | 90cad613b029f71a131303d6efaadd22aba21626 (patch) | |
| tree | 2d2c48fa6f69a478b51ded1b8da578e2a43c5cfe /indra/newview/llfolderview.cpp | |
| parent | f3bb2e31dc6a1e8e02854a70db4ecd4cf586d4ba (diff) | |
| parent | 3f9253e783826bbe27a995786be8305f8ecb2d6d (diff) | |
hg merge
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) |