Merge remote-tracking branch 'SIELA1915/move-group-with-zig' into yubo

code/ryzom/client/src/interface_v3/inventory_manager.cpp

@@ -3769,6 +3769,21 @@ void CInventoryManager::sortBag()
 	if (pIconList != NULL) pIconList->needToSort();
 	pList = dynamic_cast<CDBGroupListSheetBag*>(CWidgetManager::getInstance()->getElementFromId(LIST_PA3_TEXT));
 	if (pList != NULL) pList->needToSort();
+
+	pIconList = dynamic_cast<CDBGroupIconListBag*>(CWidgetManager::getInstance()->getElementFromId(LIST_PA4_ICONS));
+	if (pIconList != NULL) pIconList->needToSort();
+	pList = dynamic_cast<CDBGroupListSheetBag*>(CWidgetManager::getInstance()->getElementFromId(LIST_PA4_TEXT));
+	if (pList != NULL) pList->needToSort();
+
+	pIconList = dynamic_cast<CDBGroupIconListBag*>(CWidgetManager::getInstance()->getElementFromId(LIST_PA5_ICONS));
+	if (pIconList != NULL) pIconList->needToSort();
+	pList = dynamic_cast<CDBGroupListSheetBag*>(CWidgetManager::getInstance()->getElementFromId(LIST_PA5_TEXT));
+	if (pList != NULL) pList->needToSort();
+
+	pIconList = dynamic_cast<CDBGroupIconListBag*>(CWidgetManager::getInstance()->getElementFromId(LIST_PA6_ICONS));
+	if (pIconList != NULL) pIconList->needToSort();
+	pList = dynamic_cast<CDBGroupListSheetBag*>(CWidgetManager::getInstance()->getElementFromId(LIST_PA6_TEXT));
+	if (pList != NULL) pList->needToSort();
 }
 
 // ***************************************************************************

code/ryzom/client/src/interface_v3/inventory_manager.h

@@ -822,6 +822,15 @@ private:
 #define LIST_PA3_TEXT				"ui:interface:inv_pa3:content:iil:bag_list"
 #define LIST_PA3_ICONS				"ui:interface:inv_pa3:content:iil:bag_icons"
 
+#define LIST_PA4_TEXT				"ui:interface:inv_pa4:content:iil:bag_list"
+#define LIST_PA4_ICONS				"ui:interface:inv_pa4:content:iil:bag_icons"
+
+#define LIST_PA5_TEXT				"ui:interface:inv_pa5:content:iil:bag_list"
+#define LIST_PA5_ICONS				"ui:interface:inv_pa5:content:iil:bag_icons"
+
+#define LIST_PA6_TEXT				"ui:interface:inv_pa6:content:iil:bag_list"
+#define LIST_PA6_ICONS				"ui:interface:inv_pa6:content:iil:bag_icons"
+
 // Theorically never used
 #define LIST_BAG2_TEXT				"ui:interface:inv_bag:content:iil:bag_list"
 #define LIST_BAG2_ICONS				"ui:interface:inv_bag:content:iil:bag_icons"

code/ryzom/client/src/item_group_manager.cpp

@@ -733,6 +733,12 @@ std::string CItemGroupManager::toDbPath(INVENTORIES::TInventory inventory)
 		return LIST_PA2_TEXT; break;
 	case INVENTORIES::pet_animal4:
 		return LIST_PA3_TEXT; break;
+	case INVENTORIES::pet_animal5:
+		return LIST_PA4_TEXT; break;
+	case INVENTORIES::pet_animal6:
+		return LIST_PA5_TEXT; break;
+	case INVENTORIES::pet_animal7:
+		return LIST_PA6_TEXT; break;
 	case INVENTORIES::player_room:
 		return LIST_ROOM_TEXT;break;
 	case INVENTORIES::guild: