summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderview.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2009-12-17 16:48:53 -0800
committerTofu Linden <tofu.linden@lindenlab.com>2009-12-17 16:48:53 -0800
commit7105ad1def21c3e55c5c650a954b966553fe4174 (patch)
treec9259c9a4a2b23c4cfc575529f1c92d17d5a2141 /indra/newview/llfolderview.cpp
parente75242fd56ace32f7d65386f499ff104dde0eca6 (diff)
parentb29b9c961900f98121ba80447e1e737cff0d4331 (diff)
Merge.
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 db6998b267..98fae1c2a0 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -749,6 +749,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;