summaryrefslogtreecommitdiff
path: root/indra/llui/llfolderviewitem.cpp
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2013-03-04 10:14:41 -0800
committerGilbert Gonzales <gilbert@lindenlab.com>2013-03-04 10:14:41 -0800
commit3d1ec8b462bc091e9d63c385ec0bc595937f31c5 (patch)
tree7d6dda88bf45d2fae769e1ae1bf6e570bf1678a2 /indra/llui/llfolderviewitem.cpp
parent9f965be297422ddab79ff9be47fb6d5c64a5096f (diff)
parenta26c1672235578f3a4e21be370b11522207e2c57 (diff)
merge
Diffstat (limited to 'indra/llui/llfolderviewitem.cpp')
-rwxr-xr-xindra/llui/llfolderviewitem.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index f67c134751..fdb4108afb 100755
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -2072,7 +2072,7 @@ LLFolderViewItem* LLFolderViewFolder::getPreviousFromChild( LLFolderViewItem* it
if (fit != fend)
{
// try selecting child element of this folder
- if ((*fit)->isOpen())
+ if ((*fit)->isOpen() && include_children)
{
result = (*fit)->getPreviousFromChild(NULL);
}