merge

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index 8b05f8614d..9cca1b07db 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -751,7 +751,7 @@ void LLFolderView::sanitizeSelection()
 		}
 
 		// Don't allow invisible items (such as root folders) to be selected.
-		if (item->getDontShowInHierarchy())
+		if (item->getHidden())
 		{
 			items_to_remove.push_back(item);
 		}
@@ -774,7 +774,7 @@ void LLFolderView::sanitizeSelection()
 				parent_folder;
 				parent_folder = parent_folder->getParentFolder())
 			{
-				if (parent_folder->potentiallyVisible() && !parent_folder->getDontShowInHierarchy())
+				if (parent_folder->potentiallyVisible() && !parent_folder->getHidden())
 				{
 					// give initial selection to first ancestor folder that potentially passes the filter
 					if (!new_selection)
@@ -796,7 +796,7 @@ 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->getDontShowInHierarchy())
+			if (new_selection && new_selection->getHidden())
 			{
 				new_selection = NULL;
 			}