diff options
| author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
| commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
| tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Framework/PermissionsUtil.cs | |
| parent | remove lixo (diff) | |
| parent | dont change camera on crossings (diff) | |
| download | opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz | |
bad merge?
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/PermissionsUtil.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/PermissionsUtil.cs b/OpenSim/Framework/PermissionsUtil.cs index d785a78..5d3186d 100644 --- a/OpenSim/Framework/PermissionsUtil.cs +++ b/OpenSim/Framework/PermissionsUtil.cs | |||
| @@ -72,8 +72,8 @@ namespace OpenSim.Framework | |||
| 72 | /// <param name="mainPerms">The permissions variable to modify.</param> | 72 | /// <param name="mainPerms">The permissions variable to modify.</param> |
| 73 | public static void ApplyFoldedPermissions(uint foldedPerms, ref uint mainPerms) | 73 | public static void ApplyFoldedPermissions(uint foldedPerms, ref uint mainPerms) |
| 74 | { | 74 | { |
| 75 | if ((foldedPerms & 7) == 0) | 75 | // if ((foldedPerms & 7) == 0) |
| 76 | return; // assume that if the folded permissions are 0 then this means that they weren't actually recorded | 76 | // return; // assume that if the folded permissions are 0 then this means that they weren't actually recorded |
| 77 | 77 | ||
| 78 | if ((foldedPerms & ((uint)PermissionMask.Copy >> 13)) == 0) | 78 | if ((foldedPerms & ((uint)PermissionMask.Copy >> 13)) == 0) |
| 79 | mainPerms &= ~(uint)PermissionMask.Copy; | 79 | mainPerms &= ~(uint)PermissionMask.Copy; |