diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-15 19:16:42 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-15 19:16:42 -0500 |
| commit | a162d6afdae3c15641f90cee8aae29ea9e92dd98 (patch) | |
| tree | cb34b6ca52b2ad73095c75fc1658db4802b548a0 | |
| parent | fbf5d1a99221d54c242b67ffcf13d5510b5ce0a7 (diff) | |
EXT-3304 : Can't reorder items in the Favorites accordions
Fixed a bug where addChangedMask(LLInventoryObserver::SORT) was being called before the new sort order was established.
--HG--
branch : avatar-pipeline
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/llinventorypanel.cpp | 10 |
2 files changed, 3 insertions, 14 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 1b374a15a0..050676c242 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2902,6 +2902,9 @@ void saveItemsOrder(LLInventoryModel::item_array_t& items) item->updateServer(FALSE); gInventory.updateItem(item); + + // Tell the parent folder to refresh its sort order. + gInventory.addChangedMask(LLInventoryObserver::SORT, item->getParentUUID()); } gInventory.notifyObservers(); @@ -2930,10 +2933,6 @@ 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, diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index ef7069195e..3c34ba32e2 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -397,16 +397,6 @@ void LLInventoryPanel::modelChanged(U32 mask) } } } - - /* I don't think we need this code, but not positive -- Seraph - if (!handled) - { - // It's a small change that only requires a refresh. - // *TODO: figure out a more efficient way to do the refresh - // since it is expensive on large inventories - mFolders->refresh(); - } - */ } // static |