summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2009-12-16 11:43:08 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2009-12-16 11:43:08 -0500
commit9813df87af1d895a3183eb33648009fd70ce6ed7 (patch)
tree4cb519a2402856c7ede8d5ba5e8feff798ea6bdb /indra/newview/llinventorybridge.cpp
parentadec0ba983c6b01c3d6c08692f3d5c7979ba90bb (diff)
parent073ec70829723e54f822052fe9c6c3e998e8dfca (diff)
merge
--HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rw-r--r--indra/newview/llinventorybridge.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 78e84c9216..bacc685130 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2905,6 +2905,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();
@@ -2933,10 +2936,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,