diff options
| author | skolb <> | 2009-12-18 10:54:16 -0800 |
|---|---|---|
| committer | skolb <> | 2009-12-18 10:54:16 -0800 |
| commit | d5b53eb483ec042d83859ec957dce7699c7469aa (patch) | |
| tree | 289ff588bf8f35bc94fbdf3844279bc8cd299b1a /indra/newview/llfolderviewitem.cpp | |
| parent | eb7bd0a214ad794db9cb2acb33c45b9d7f46b981 (diff) | |
| parent | ad6d0e3bb766c737b1e9bbd9d006391cc8bcc085 (diff) | |
Merge viewer 2 into media
Diffstat (limited to 'indra/newview/llfolderviewitem.cpp')
| -rw-r--r-- | indra/newview/llfolderviewitem.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp index 8a13964708..9ae0c9100a 100644 --- a/indra/newview/llfolderviewitem.cpp +++ b/indra/newview/llfolderviewitem.cpp @@ -199,7 +199,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) |