diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-02-02 17:11:42 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-02-02 17:11:42 -0500 |
| commit | 847a3a12208359653aa7432f7f64c31669ec8963 (patch) | |
| tree | 0d786028faba3aad64bd212e1079b825cc26154c /indra | |
| parent | 9a4d079b92d430cc86ddbee36efbd1ca58ddb986 (diff) | |
EXT-4243 : Sorting is broken in inventory
Landmarks were being special cased for sorting; removed this so that they sort by the same rules of other folders.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfolderviewitem.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp index b05eb84e52..f154de39c9 100644 --- a/indra/newview/llfolderviewitem.cpp +++ b/indra/newview/llfolderviewitem.cpp @@ -2540,13 +2540,11 @@ 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) || - (a_uuid == landmarks_folder_id && b_uuid == landmarks_folder_id)) + if ((a_uuid == favorites_folder_id && b_uuid == favorites_folder_id)) { // *TODO: mantipov: probably it is better to add an appropriate method to LLFolderViewItem // or to LLInvFVBridge |