summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderview.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-06-20 00:19:05 -0700
committerRichard Linden <none@none>2012-06-20 00:19:05 -0700
commit3882e9c177190b22276e1ef3fc39e4cb910820fd (patch)
tree83ba07ff949abf82130ed1e9aef9520a0778cdac /indra/newview/llfolderview.cpp
parent9e49fb558f894a1960d208114b8c051536f58c9e (diff)
CHUI-101 WIP Make LLFolderview general purpose
more compilation fixes, just need to add getName() back to LLInventoryFilter et al
Diffstat (limited to 'indra/newview/llfolderview.cpp')
-rw-r--r--indra/newview/llfolderview.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index f0edbb638a..78f4bc1119 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -1976,7 +1976,7 @@ void LLFolderView::doIdle()
LLFastTimer t3(FTM_AUTO_SELECT);
// select new item only if a filtered item not currently selected
LLFolderViewItem* selected_itemp = mSelectedItems.empty() ? NULL : mSelectedItems.back();
- if (!mAutoSelectOverride && (!selected_itemp || !selected_itemp->potentiallyFiltered()))
+ if (!mAutoSelectOverride && (!selected_itemp || !selected_itemp->potentiallyHidden()))
{
// these are named variables to get around gcc not binding non-const references to rvalues
// and functor application is inherently non-const to allow for stateful functors
@@ -2293,3 +2293,9 @@ S32 LLFolderView::getItemHeight()
}
return debug_height;
}
+
+//TODO RN: move to llfolderviewmodel.cpp file
+bool LLFolderViewModelCommon::needsSort(LLFolderViewModelItem* item)
+{
+ return item->getSortVersion() < mTargetSortVersion;
+}