diff options
| author | Melanie Thielker | 2017-01-13 17:09:08 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2017-01-13 17:09:08 +0000 |
| commit | c74fa02d87058e1d974b47c9a4d49c60ded07b51 (patch) | |
| tree | fb8eef1da0cd2e8bc453a0b3aea8a24dae14a675 /OpenSim | |
| parent | Merge branch 'master' of opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-c74fa02d87058e1d974b47c9a4d49c60ded07b51.zip opensim-SC_OLD-c74fa02d87058e1d974b47c9a4d49c60ded07b51.tar.gz opensim-SC_OLD-c74fa02d87058e1d974b47c9a4d49c60ded07b51.tar.bz2 opensim-SC_OLD-c74fa02d87058e1d974b47c9a4d49c60ded07b51.tar.xz | |
Harmonize case in Permissions enum
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Framework/Util.cs | 9 | ||||
| -rw-r--r-- | OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 6d679f2..6c0142e 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
| @@ -63,11 +63,12 @@ namespace OpenSim.Framework | |||
| 63 | None = 0, | 63 | None = 0, |
| 64 | 64 | ||
| 65 | // folded perms | 65 | // folded perms |
| 66 | foldedTransfer = 1, | 66 | FoldedTransfer = 1, |
| 67 | foldedModify = 1 << 1, | 67 | FoldedModify = 1 << 1, |
| 68 | foldedCopy = 1 << 2, | 68 | FoldedCopy = 1 << 2, |
| 69 | FoldedExport = 1 << 4, | ||
| 69 | 70 | ||
| 70 | foldedMask = 0x07, | 71 | FoldedMask = 0x17, |
| 71 | 72 | ||
| 72 | // | 73 | // |
| 73 | Transfer = 1 << 13, | 74 | Transfer = 1 << 13, |
diff --git a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs index 5a46201..e188665 100644 --- a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs | |||
| @@ -129,9 +129,9 @@ namespace OpenSim.Tests.Common | |||
| 129 | item.AssetType = asset.Type; | 129 | item.AssetType = asset.Type; |
| 130 | item.InvType = (int)itemType; | 130 | item.InvType = (int)itemType; |
| 131 | item.BasePermissions = (uint)OpenMetaverse.PermissionMask.All | | 131 | item.BasePermissions = (uint)OpenMetaverse.PermissionMask.All | |
| 132 | (uint)(Framework.PermissionMask.foldedMask | Framework.PermissionMask.foldedCopy | Framework.PermissionMask.foldedModify | Framework.PermissionMask.foldedTransfer); | 132 | (uint)(Framework.PermissionMask.FoldedMask | Framework.PermissionMask.FoldedCopy | Framework.PermissionMask.FoldedModify | Framework.PermissionMask.FoldedTransfer); |
| 133 | item.CurrentPermissions = (uint)OpenMetaverse.PermissionMask.All | | 133 | item.CurrentPermissions = (uint)OpenMetaverse.PermissionMask.All | |
| 134 | (uint)(Framework.PermissionMask.foldedMask | Framework.PermissionMask.foldedCopy | Framework.PermissionMask.foldedModify | Framework.PermissionMask.foldedTransfer); | 134 | (uint)(Framework.PermissionMask.FoldedMask | Framework.PermissionMask.FoldedCopy | Framework.PermissionMask.FoldedModify | Framework.PermissionMask.FoldedTransfer); |
| 135 | 135 | ||
| 136 | InventoryFolderBase folder = InventoryArchiveUtils.FindFoldersByPath(scene.InventoryService, userId, path)[0]; | 136 | InventoryFolderBase folder = InventoryArchiveUtils.FindFoldersByPath(scene.InventoryService, userId, path)[0]; |
| 137 | 137 | ||
| @@ -371,4 +371,4 @@ namespace OpenSim.Tests.Common | |||
| 371 | return InventoryArchiveUtils.FindItemsByPath(inventoryService, userId, path); | 371 | return InventoryArchiveUtils.FindItemsByPath(inventoryService, userId, path); |
| 372 | } | 372 | } |
| 373 | } | 373 | } |
| 374 | } \ No newline at end of file | 374 | } |