From 563d5d30eec47f57c5e9531b637de7b1169525d7 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 27 May 2020 00:04:01 +0100 Subject: [PATCH] some more suport for a new inventory and asset type --- .../Framework/InventoryAccess/InventoryAccessModule.cs | 5 +---- .../Services/HypergridService/HGSuitcaseInventoryService.cs | 2 ++ OpenSim/Services/InventoryService/XInventoryService.cs | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index fb389c4cd7..fe14ebb6e5 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs @@ -226,7 +226,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess groupmask = (uint)PermissionMask.AllAndExport; everyonemask = (uint)(PermissionMask.AllAndExport & ~PermissionMask.Modify); } -/* if(assetType == (byte)AssetType.Settings) { if(data == null) @@ -244,9 +243,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess } flags = subType; } - else -*/ - if( assetType == (byte)AssetType.Clothing || + else if( assetType == (byte)AssetType.Clothing || assetType == (byte)AssetType.Bodypart) flags = subType; diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs index dbd96b8432..e700978a68 100644 --- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs +++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs @@ -210,6 +210,8 @@ namespace OpenSim.Services.HypergridService CreateFolder(principalID, rootID, (int)FolderType.Texture, "Textures"); if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.Trash) return true; return false; })) CreateFolder(principalID, rootID, (int)FolderType.Trash, "Trash"); + if (!Array.Exists(sysFolders, delegate (XInventoryFolder f) { if (f.type == (int)FolderType.Settings) return true; return false; })) + CreateFolder(principalID, rootID, (int)FolderType.Settings, "Settings"); } public override InventoryFolderBase GetFolderForType(UUID principalID, FolderType type) diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs index b8ed46cacb..0446ac2fd9 100644 --- a/OpenSim/Services/InventoryService/XInventoryService.cs +++ b/OpenSim/Services/InventoryService/XInventoryService.cs @@ -153,6 +153,8 @@ namespace OpenSim.Services.InventoryService CreateFolder(principalID, rootFolder.ID, (int)FolderType.Texture, "Textures"); if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.Trash) return true; return false; })) CreateFolder(principalID, rootFolder.ID, (int)FolderType.Trash, "Trash"); + if (!Array.Exists(sysFolders, delegate (XInventoryFolder f) { if (f.type == (int)FolderType.Settings) return true; return false; })) + CreateFolder(principalID, rootFolder.ID, (int)FolderType.Settings, "Settings"); return result; }