summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderviewitem.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2009-12-17 15:21:14 -0500
committerLoren Shih <seraph@lindenlab.com>2009-12-17 15:21:14 -0500
commit3c38c7f14869f803538bcb87a109f26fecc9d107 (patch)
treef213206a165faeabcee06cedd1161ad213537c87 /indra/newview/llfolderviewitem.cpp
parentd2abd1779af977fb0ce205a33c171109bb62d589 (diff)
EXT-1634 : Block collapse/expand of accordion "root" folder by keyword
Hidden folders are no longer allowed to be selected. --HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llfolderviewitem.cpp')
-rw-r--r--indra/newview/llfolderviewitem.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp
index 135821f662..c2607dcc9a 100644
--- a/indra/newview/llfolderviewitem.cpp
+++ b/indra/newview/llfolderviewitem.cpp
@@ -198,7 +198,9 @@ LLFolderViewItem* LLFolderViewItem::getPreviousOpenNode(BOOL include_children)
}
LLFolderViewItem* itemp = mParentFolder->getPreviousFromChild( this, include_children );
- while(itemp && !itemp->getVisible())
+
+ // Skip over items that are invisible or are hidden from the UI.
+ while(itemp && (!itemp->getVisible() || itemp->getDontShowInHierarchy()))
{
LLFolderViewItem* next_itemp = itemp->mParentFolder->getPreviousFromChild( itemp, include_children );
if (itemp == next_itemp)