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

Harmonize case in Permissions enum

melanie
Melanie Thielker 2017-01-13 17:09:08 +00:00
parent dafb362b60
commit c74fa02d87
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Framework/Util.cs
View File

@ -63,11 +63,12 @@ namespace OpenSim.Framework
None = 0, None = 0,
// folded perms // folded perms
foldedTransfer = 1, FoldedTransfer = 1,
foldedModify = 1 << 1, FoldedModify = 1 << 1,
foldedCopy = 1 << 2, FoldedCopy = 1 << 2,
FoldedExport = 1 << 4,
foldedMask = 0x07, FoldedMask = 0x17,
// //
Transfer = 1 << 13, Transfer = 1 << 13,

6
OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
View File

@ -129,9 +129,9 @@ namespace OpenSim.Tests.Common
item.AssetType = asset.Type; item.AssetType = asset.Type;
item.InvType = (int)itemType; item.InvType = (int)itemType;
item.BasePermissions = (uint)OpenMetaverse.PermissionMask.All | item.BasePermissions = (uint)OpenMetaverse.PermissionMask.All |
(uint)(Framework.PermissionMask.foldedMask | Framework.PermissionMask.foldedCopy | Framework.PermissionMask.foldedModify | Framework.PermissionMask.foldedTransfer); (uint)(Framework.PermissionMask.FoldedMask | Framework.PermissionMask.FoldedCopy | Framework.PermissionMask.FoldedModify | Framework.PermissionMask.FoldedTransfer);
item.CurrentPermissions = (uint)OpenMetaverse.PermissionMask.All | item.CurrentPermissions = (uint)OpenMetaverse.PermissionMask.All |
(uint)(Framework.PermissionMask.foldedMask | Framework.PermissionMask.foldedCopy | Framework.PermissionMask.foldedModify | Framework.PermissionMask.foldedTransfer); (uint)(Framework.PermissionMask.FoldedMask | Framework.PermissionMask.FoldedCopy | Framework.PermissionMask.FoldedModify | Framework.PermissionMask.FoldedTransfer);
InventoryFolderBase folder = InventoryArchiveUtils.FindFoldersByPath(scene.InventoryService, userId, path)[0]; InventoryFolderBase folder = InventoryArchiveUtils.FindFoldersByPath(scene.InventoryService, userId, path)[0];
@ -371,4 +371,4 @@ namespace OpenSim.Tests.Common
return InventoryArchiveUtils.FindItemsByPath(inventoryService, userId, path); return InventoryArchiveUtils.FindItemsByPath(inventoryService, userId, path);
} }
} }
} }