diff options
author | Oz Linden <oz@lindenlab.com> | 2017-08-23 09:19:59 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2017-08-23 09:19:59 -0400 |
commit | bcf5dc079a5dc9434b541a971e28315fa5cb9816 (patch) | |
tree | 16f6b186d704ca9682bcbfcb8aca1e29ef85b103 /indra/llui/llfolderviewitem.cpp | |
parent | fa53653e60f5761c157b76423b4449fe38788d8f (diff) | |
parent | 08cbed55ef5689fcc5a02dfb3b9afde15487036e (diff) |
merge changes for 5.0.7-release
Diffstat (limited to 'indra/llui/llfolderviewitem.cpp')
-rw-r--r-- | indra/llui/llfolderviewitem.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp index 3d618548c4..0510e472c5 100644 --- a/indra/llui/llfolderviewitem.cpp +++ b/indra/llui/llfolderviewitem.cpp @@ -1176,6 +1176,11 @@ BOOL LLFolderViewFolder::needsArrange() return mLastArrangeGeneration < getRoot()->getArrangeGeneration(); } +bool LLFolderViewFolder::descendantsPassedFilter(S32 filter_generation) +{ + return getViewModelItem()->descendantsPassedFilter(filter_generation); +} + // Passes selection information on to children and record selection // information if necessary. BOOL LLFolderViewFolder::setSelection(LLFolderViewItem* selection, BOOL openitem, |