diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-18 17:58:09 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-18 17:58:09 -0500 |
| commit | 061b8d3aa659ad27cf6a5ff0ac3597036bfd8cf5 (patch) | |
| tree | 367d9b4fe9be311f312ae4dee51c230565bca5ea | |
| parent | fb81795a2d009480482af13b536702002ed7c8f2 (diff) | |
EXT-1916 : Places: Landmarks are not sorted in the Favorites Bar Accordion
| -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 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 |