summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-06-23 15:49:16 -0400
committerLeslie Linden <leslie@lindenlab.com>2011-06-23 15:49:16 -0400
commite7d86046d9bba6f0da34a6417e6bb45be518accd (patch)
treea91474b57b152c042de6adef4fd0e4325593509e /indra
parentaf142618f9c18a418bd11ab8eae6c83caa03ddac (diff)
Build fixes from the merge.
Recommended by Richard.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llfolderview.cpp5
-rw-r--r--indra/newview/llfolderviewitem.cpp3
2 files changed, 1 insertions, 7 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index 27b58bec4e..bfc4fcaec6 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -816,11 +816,6 @@ void LLFolderView::sanitizeSelection()
{
// nothing selected to start with, so pick "My Inventory" as best guess
new_selection = getItemByID(gInventory.getRootFolderID());
- // ... except if it's hidden from the UI.
- if (new_selection && new_selection->getHidden())
- {
- new_selection = NULL;
- }
}
if (new_selection)
diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp
index 38b36af6f0..f5e1aa005b 100644
--- a/indra/newview/llfolderviewitem.cpp
+++ b/indra/newview/llfolderviewitem.cpp
@@ -1206,8 +1206,7 @@ S32 LLFolderViewFolder::arrange( S32* width, S32* height, S32 filter_generation)
bool is_hidden = folderp->getListener() && LLViewerFolderType::lookupIsHiddenType(folderp->getListener()->getPreferredType());
folderp->setVisible( !is_hidden
- && (show_folder_state == LLInventoryFilter::SHOW_ALL_FOLDERS
- || (folderp->getFiltered(filter_generation) || folderp->hasFilteredDescendants(filter_generation)))); // passed filter or has descendants that passed filter
+ && (folderp->getFiltered(filter_generation) || folderp->hasFilteredDescendants(filter_generation))); // passed filter or has descendants that passed filter
}
if (folderp->getVisible())