summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderview.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/llfolderview.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/llfolderview.cpp')
-rw-r--r--indra/newview/llfolderview.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index adf7f08702..640b0d7d8f 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -748,6 +748,12 @@ void LLFolderView::sanitizeSelection()
}
}
}
+
+ // Don't allow invisible items (such as root folders) to be selected.
+ if (item->getDontShowInHierarchy())
+ {
+ items_to_remove.push_back(item);
+ }
}
std::vector<LLFolderViewItem*>::iterator item_it;