diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-15 13:47:31 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-15 13:47:31 -0500 |
| commit | fbf5d1a99221d54c242b67ffcf13d5510b5ce0a7 (patch) | |
| tree | 5d4381838d2470d50921de55c8b509c029868b83 /indra/newview/llinventorybridge.cpp | |
| parent | d19a9f7cb2d14f1b4a41a4f14542e84742df25f0 (diff) | |
EXT-3304 : Can't reorder items in the Favorites accordions
EXT-3476 : Dragging and item in the PlacesSP brings up the InventorySP
EXT-1916 : Landmarks are not sorted in the Favorites Accordion
Added a new LLInventoryObserver::SORT request for resorting folder contents.
Landmarks no longer use the same sorting as accordions.
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index ab06ac1691..1b374a15a0 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2930,6 +2930,10 @@ void updateItemsOrder(LLInventoryModel::item_array_t& items, const LLUUID& srcIt items.erase(findItemByUUID(items, srcItem->getUUID())); items.insert(findItemByUUID(items, destItem->getUUID()), srcItem); + + // Refresh the folder view. + gInventory.addChangedMask(LLInventoryObserver::SORT, srcItem->getParentUUID()); + gInventory.notifyObservers(); } BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item, @@ -2998,8 +3002,7 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item, } const LLUUID& favorites_id = model->findCategoryUUIDForType(LLFolderType::FT_FAVORITE); - const LLUUID& landmarks_id = model->findCategoryUUIDForType(LLFolderType::FT_LANDMARK); - const BOOL folder_allows_reorder = ((mUUID == landmarks_id) || (mUUID == favorites_id)); + const BOOL folder_allows_reorder = (mUUID == favorites_id); // we can move item inside a folder only if this folder is Favorites. See EXT-719 accept = is_movable && ((mUUID != inv_item->getParentUUID()) || folder_allows_reorder); @@ -3014,7 +3017,7 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item, // everything in the active window so that we don't follow // the selection to its new location (which is very // annoying). - LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(); + LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(FALSE); if (active_panel) { LLInventoryPanel* panel = dynamic_cast<LLInventoryPanel*>(mInventoryPanel.get()); |