diff options
| author | UbitUmarov | 2017-04-30 14:39:20 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-04-30 14:39:20 +0100 |
| commit | 0d59a29dc7c6f732da266a4ed4fddb5b39521ddf (patch) | |
| tree | 7cd379c3d6b0dbe9384461de5df3c147aab5e58e | |
| parent | remove a redundant operation (diff) | |
| download | opensim-SC_OLD-0d59a29dc7c6f732da266a4ed4fddb5b39521ddf.zip opensim-SC_OLD-0d59a29dc7c6f732da266a4ed4fddb5b39521ddf.tar.gz opensim-SC_OLD-0d59a29dc7c6f732da266a4ed4fddb5b39521ddf.tar.bz2 opensim-SC_OLD-0d59a29dc7c6f732da266a4ed4fddb5b39521ddf.tar.xz | |
save some nanoseconds if unfolding will not change anything ( export default mks it rare, but looks nice)
| -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 aba8320..cf93323 100644 --- a/OpenSim/Framework/PermissionsUtil.cs +++ b/OpenSim/Framework/PermissionsUtil.cs | |||
| @@ -68,7 +68,7 @@ namespace OpenSim.Framework | |||
| 68 | public static void ApplyFoldedPermissions(uint foldedSourcePerms, ref uint targetPerms) | 68 | public static void ApplyFoldedPermissions(uint foldedSourcePerms, ref uint targetPerms) |
| 69 | { | 69 | { |
| 70 | uint folded = foldedSourcePerms & (uint)PermissionMask.FoldedMask; | 70 | uint folded = foldedSourcePerms & (uint)PermissionMask.FoldedMask; |
| 71 | if(folded == 0) // invalid we need to ignore | 71 | if(folded == 0 || folded == (uint)PermissionMask.FoldedMask) // invalid we need to ignore, or nothing to do |
| 72 | return; | 72 | return; |
| 73 | 73 | ||
| 74 | folded <<= (int)PermissionMask.FoldingShift; | 74 | folded <<= (int)PermissionMask.FoldingShift; |
| @@ -83,7 +83,7 @@ namespace OpenSim.Framework | |||
| 83 | public static void ApplyNoModFoldedPermissions(uint foldedSourcePerms, ref uint target) | 83 | public static void ApplyNoModFoldedPermissions(uint foldedSourcePerms, ref uint target) |
| 84 | { | 84 | { |
| 85 | uint folded = foldedSourcePerms & (uint)PermissionMask.FoldedMask; | 85 | uint folded = foldedSourcePerms & (uint)PermissionMask.FoldedMask; |
| 86 | if(folded == 0) // invalid we need to ignore | 86 | if(folded == 0 || folded == (uint)PermissionMask.FoldedMask) // invalid we need to ignore, or nothing to do |
| 87 | return; | 87 | return; |
| 88 | 88 | ||
| 89 | folded <<= (int)PermissionMask.FoldingShift; | 89 | folded <<= (int)PermissionMask.FoldingShift; |