From 2d82332479b3a8d8bdd869c14bdef03226e0b74f Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Tue, 17 Nov 2009 21:23:53 -0500 Subject: Fix for avp->hg incorrect merge. --- indra/newview/llfolderviewitem.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/llfolderviewitem.cpp') diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp index bf74c5c936..7323c421da 100644 --- a/indra/newview/llfolderviewitem.cpp +++ b/indra/newview/llfolderviewitem.cpp @@ -1253,6 +1253,10 @@ void LLFolderViewFolder::filter( LLInventoryFilter& filter) // filter self only on first pass through LLFolderViewItem::filter( filter ); } + if (mDontShowInHierarchy) + { + setOpen(); + } } if (getRoot()->getDebugFilters()) -- cgit v1.3 From 061b8d3aa659ad27cf6a5ff0ac3597036bfd8cf5 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Wed, 18 Nov 2009 17:58:09 -0500 Subject: EXT-1916 : Places: Landmarks are not sorted in the Favorites Bar Accordion --- indra/newview/llfolderviewitem.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview/llfolderviewitem.cpp') diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp index 7323c421da..a1260d1156 100644 --- a/indra/newview/llfolderviewitem.cpp +++ b/indra/newview/llfolderviewitem.cpp @@ -2498,11 +2498,13 @@ bool LLInventorySort::operator()(const LLFolderViewItem* const& a, const LLFolde { static const LLUUID& favorites_folder_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_FAVORITE); + static const LLUUID& landmarks_folder_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_LANDMARK); LLUUID a_uuid = a->getParentFolder()->getListener()->getUUID(); LLUUID b_uuid = b->getParentFolder()->getListener()->getUUID(); - if (a_uuid == favorites_folder_id && b_uuid == favorites_folder_id) + if ((a_uuid == favorites_folder_id && b_uuid == favorites_folder_id) || + (a_uuid == landmarks_folder_id && b_uuid == landmarks_folder_id)) { // *TODO: mantipov: probably it is better to add an appropriate method to LLFolderViewItem // or to LLInvFVBridge -- cgit v1.3