diff options
author | Loren Shih <seraph@lindenlab.com> | 2009-12-21 12:56:52 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2009-12-21 12:56:52 -0500 |
commit | 5aaaa4e9473615c06fde9e19f34d309aa7b9fb0f (patch) | |
tree | 4deec6d1a1c84db5cfbbbf9c6a6dc4ad9b2df61b /indra/newview/llfolderview.cpp | |
parent | 83d29715544355e7c6e808e36385803fe23b35c9 (diff) |
EXT-3567 : Folders hsould show as "Loading..." when contents are being fetched
Name change "DontShowInHierarchy"->"Hidden".
Diffstat (limited to 'indra/newview/llfolderview.cpp')
-rw-r--r-- | indra/newview/llfolderview.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 8b05f8614d..9cca1b07db 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -751,7 +751,7 @@ void LLFolderView::sanitizeSelection() } // Don't allow invisible items (such as root folders) to be selected. - if (item->getDontShowInHierarchy()) + if (item->getHidden()) { items_to_remove.push_back(item); } @@ -774,7 +774,7 @@ void LLFolderView::sanitizeSelection() parent_folder; parent_folder = parent_folder->getParentFolder()) { - if (parent_folder->potentiallyVisible() && !parent_folder->getDontShowInHierarchy()) + if (parent_folder->potentiallyVisible() && !parent_folder->getHidden()) { // give initial selection to first ancestor folder that potentially passes the filter if (!new_selection) @@ -796,7 +796,7 @@ void LLFolderView::sanitizeSelection() // nothing selected to start with, so pick "My Inventory" as best guess new_selection = getItemByID(gInventory.getRootFolderID()); // ... except if it's hidden from the UI. - if (new_selection && new_selection->getDontShowInHierarchy()) + if (new_selection && new_selection->getHidden()) { new_selection = NULL; } |