aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/PermissionsUtil.cs
diff options
context:
space:
mode:
authorUbitUmarov2014-08-05 17:55:30 +0100
committerUbitUmarov2014-08-05 17:55:30 +0100
commit6eca2475d4babfcf84aa40a885ff1e65e99a9420 (patch)
tree1613cba20d22a35dded4b0b5894b0558d32770ad /OpenSim/Framework/PermissionsUtil.cs
parentdiference fix (diff)
downloadopensim-SC-6eca2475d4babfcf84aa40a885ff1e65e99a9420.zip
opensim-SC-6eca2475d4babfcf84aa40a885ff1e65e99a9420.tar.gz
opensim-SC-6eca2475d4babfcf84aa40a885ff1e65e99a9420.tar.bz2
opensim-SC-6eca2475d4babfcf84aa40a885ff1e65e99a9420.tar.xz
dont assume that all zero folded perms are to ignore ( coerence with old
code in avn-current )
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/PermissionsUtil.cs4
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;