aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common
diff options
context:
space:
mode:
authorMelanie Thielker2017-01-13 17:09:08 +0000
committerMelanie Thielker2017-01-13 17:09:08 +0000
commitc74fa02d87058e1d974b47c9a4d49c60ded07b51 (patch)
treefb8eef1da0cd2e8bc453a0b3aea8a24dae14a675 /OpenSim/Tests/Common
parentMerge branch 'master' of opensimulator.org:/var/git/opensim (diff)
downloadopensim-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/Tests/Common')
-rw-r--r--OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs6
1 files changed, 3 insertions, 3 deletions
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}