aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie Thielker2017-01-06 13:17:43 +0000
committerMelanie Thielker2017-01-06 13:17:43 +0000
commit4385d7d6934443530c1e14976e40f01dc90175bf (patch)
tree0d681647272df3422fff6d09f7d3f126f42a7b3d /OpenSim/Framework
parentrestore parcels avatars visibility god level change correct handling; try to... (diff)
downloadopensim-SC-4385d7d6934443530c1e14976e40f01dc90175bf.zip
opensim-SC-4385d7d6934443530c1e14976e40f01dc90175bf.tar.gz
opensim-SC-4385d7d6934443530c1e14976e40f01dc90175bf.tar.bz2
opensim-SC-4385d7d6934443530c1e14976e40f01dc90175bf.tar.xz
Fix errors introduced by incomplete understanding of what folded perms are
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/PermissionsUtil.cs19
1 files changed, 0 insertions, 19 deletions
diff --git a/OpenSim/Framework/PermissionsUtil.cs b/OpenSim/Framework/PermissionsUtil.cs
index 5d3186d..3dce04d 100644
--- a/OpenSim/Framework/PermissionsUtil.cs
+++ b/OpenSim/Framework/PermissionsUtil.cs
@@ -64,24 +64,5 @@ namespace OpenSim.Framework
64 str = "."; 64 str = ".";
65 return str; 65 return str;
66 } 66 }
67
68 /// <summary>
69 /// Applies an object's folded permissions to its regular permissions.
70 /// </summary>
71 /// <param name="foldedPerms">The folded permissions. Only the lowest 7 bits are examined.</param>
72 /// <param name="mainPerms">The permissions variable to modify.</param>
73 public static void ApplyFoldedPermissions(uint foldedPerms, ref uint mainPerms)
74 {
75// if ((foldedPerms & 7) == 0)
76// return; // assume that if the folded permissions are 0 then this means that they weren't actually recorded
77
78 if ((foldedPerms & ((uint)PermissionMask.Copy >> 13)) == 0)
79 mainPerms &= ~(uint)PermissionMask.Copy;
80 if ((foldedPerms & ((uint)PermissionMask.Transfer >> 13)) == 0)
81 mainPerms &= ~(uint)PermissionMask.Transfer;
82 if ((foldedPerms & ((uint)PermissionMask.Modify >> 13)) == 0)
83 mainPerms &= ~(uint)PermissionMask.Modify;
84 }
85
86 } 67 }
87} 68}