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

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,

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