diff options
author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2010-02-09 18:01:45 -0500 |
---|---|---|
committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2010-02-09 18:01:45 -0500 |
commit | 543a75919aff1e82bbc38a731f1fc359201f13cc (patch) | |
tree | 6cf9cdc2f08b76f11a23ba55877c66046f606955 | |
parent | 47f920824394523854f1f67fc8b70c4239107fbb (diff) | |
parent | bef6944ce123c67c29ea3dd27c9ae1597627e154 (diff) |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
-rw-r--r-- | indra/newview/llfolderviewitem.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp index f154de39c9..20cb2d3604 100644 --- a/indra/newview/llfolderviewitem.cpp +++ b/indra/newview/llfolderviewitem.cpp @@ -1339,10 +1339,6 @@ void LLFolderViewFolder::filter( LLInventoryFilter& filter) if (folder->getFiltered() || folder->hasFilteredDescendants(filter.getMinRequiredGeneration())) { mMostFilteredDescendantGeneration = filter_generation; - if (getRoot()->needsAutoSelect() && autoopen_folders) - { - folder->setOpenArrangeRecursively(TRUE); - } } // just skip it, it has already been filtered continue; |