diff options
| author | Anchor Linden <anchor@lindenlab.com> | 2018-05-21 16:47:42 -0700 |
|---|---|---|
| committer | Anchor Linden <anchor@lindenlab.com> | 2018-05-21 16:47:42 -0700 |
| commit | 0fdbe7e34df55ac92302b4af38c42d03454d3bc1 (patch) | |
| tree | 038c6087299c9096ac7c6606ec45a8339eb0fd72 /indra/newview/llinventoryfilter.cpp | |
| parent | 3bf89821d9c9777a0f24d89280bd7a7011a7a3df (diff) | |
| parent | c70119ebabc4b06e2b0db02aea8c56e01fbc666e (diff) | |
Merge
Diffstat (limited to 'indra/newview/llinventoryfilter.cpp')
| -rw-r--r-- | indra/newview/llinventoryfilter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp index 9193613e9f..f64c39c3ad 100644 --- a/indra/newview/llinventoryfilter.cpp +++ b/indra/newview/llinventoryfilter.cpp @@ -153,7 +153,7 @@ bool LLInventoryFilter::checkFolder(const LLUUID& folder_id) const // we're showing all folders, overriding filter if (mFilterOps.mShowFolderState == LLInventoryFilter::SHOW_ALL_FOLDERS) { - return true; + return !gInventory.isCategoryHidden(folder_id); } // when applying a filter, matching folders get their contents downloaded first |