#3910 Fix sorting of 'favorites' inventory tab

Author: akleshchev

indra/newview/llfolderviewmodelinventory.cpp

@@ -69,7 +69,7 @@ void LLFolderViewModelInventory::sort( LLFolderViewFolder* folder )
     if (!folder->areChildrenInited() || !needsSort(folder->getViewModelItem())) return;
 
     LLFolderViewModelItemInventory* sort_modelp =   static_cast<LLFolderViewModelItemInventory*>(folder->getViewModelItem());
-    if (sort_modelp->getUUID().isNull()) return;
+    if (!sort_modelp->canSortContent()) return;
 
     bool has_favorites = false;
     for (std::list<LLFolderViewFolder*>::iterator it =   folder->getFoldersBegin(), end_it = folder->getFoldersEnd();

indra/newview/llfolderviewmodelinventory.h

@@ -59,6 +59,7 @@ class LLFolderViewModelItemInventory
     virtual EInventorySortGroup getSortGroup() const = 0;
     virtual LLInventoryObject* getInventoryObject() const = 0;
     virtual void requestSort();
+    virtual bool canSortContent() const { return getUUID().notNull(); }
     virtual void setPassedFilter(bool filtered, S32 filter_generation, std::string::size_type string_offset = std::string::npos, std::string::size_type string_size = 0);
     virtual bool filter( LLFolderViewFilter& filter);
     virtual bool filterChildItem( LLFolderViewModelItem* item, LLFolderViewFilter& filter);

indra/newview/llinventorybridge.h

@@ -777,6 +777,7 @@ class LLFavoritesFolderBridge : public LLFolderBridge
         mInvType = type;
     }
     /*virtual*/ void buildContextMenu(LLMenuGL& menu, U32 flags);
+    /*virtual*/ bool canSortContent() const { return true; }
 };
 
 // Bridge builder to create Inventory-Folder-View-Bridge for Recent Inventory Panel