OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some more suport for a new inventory and asset type

master
UbitUmarov 2020-05-27 00:04:01 +01:00
parent 182b266ec4
commit 563d5d30ee
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
View File

@ -226,7 +226,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
groupmask = (uint)PermissionMask.AllAndExport; groupmask = (uint)PermissionMask.AllAndExport;
everyonemask = (uint)(PermissionMask.AllAndExport & ~PermissionMask.Modify); everyonemask = (uint)(PermissionMask.AllAndExport & ~PermissionMask.Modify);
} }
/*
if(assetType == (byte)AssetType.Settings) if(assetType == (byte)AssetType.Settings)
{ {
if(data == null) if(data == null)
@ -244,9 +243,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
} }
flags = subType; flags = subType;
} }
else else if( assetType == (byte)AssetType.Clothing ||
*/
if( assetType == (byte)AssetType.Clothing ||
assetType == (byte)AssetType.Bodypart) assetType == (byte)AssetType.Bodypart)
flags = subType; flags = subType;

2
OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
View File

@ -210,6 +210,8 @@ namespace OpenSim.Services.HypergridService
CreateFolder(principalID, rootID, (int)FolderType.Texture, "Textures"); CreateFolder(principalID, rootID, (int)FolderType.Texture, "Textures");
if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.Trash) return true; return false; })) if (!Array.Exists(sysFolders, delegate(XInventoryFolder f) { if (f.type == (int)FolderType.Trash) return true; return false; }))
CreateFolder(principalID, rootID, (int)FolderType.Trash, "Trash"); 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) public override InventoryFolderBase GetFolderForType(UUID principalID, FolderType type)

2
OpenSim/Services/InventoryService/XInventoryService.cs
View File

@ -153,6 +153,8 @@ namespace OpenSim.Services.InventoryService
CreateFolder(principalID, rootFolder.ID, (int)FolderType.Texture, "Textures"); 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; })) 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"); 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; return result;
} }