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

1 files changed, 13 insertions, 1 deletions

diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 92b9dc427f..ef7069195e 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -278,6 +278,7 @@ void LLInventoryPanel::modelChanged(U32 mask)
 		const LLUUID& item_id = (*items_iter);
 		const LLInventoryObject* model_item = model->getObject(item_id);
 		LLFolderViewItem* view_item = mFolders->getItemByID(item_id);
+		LLFolderViewFolder* view_folder = mFolders->getFolderByID(item_id);
 
 		//////////////////////////////
 		// LABEL Operation
@@ -320,7 +321,18 @@ void LLInventoryPanel::modelChanged(U32 mask)
 				view_item->refresh();
 			}
 		}
-	
+
+		//////////////////////////////
+		// SORT Operation
+		// Sort the folder.
+		if (mask & LLInventoryObserver::SORT)
+		{
+			if (view_folder)
+			{
+				view_folder->requestSort();
+			}
+		}	
+
 		// We don't typically care which of these masks the item is actually flagged with, since the masks
 		// may not be accurate (e.g. in the main inventory panel, I move an item from My Inventory into
 		// Landmarks; this is a STRUCTURE change for that panel but is an ADD change for the Landmarks