diff options
author | UbitUmarov | 2017-04-29 22:09:45 +0100 |
---|---|---|
committer | UbitUmarov | 2017-04-29 22:09:45 +0100 |
commit | 522695c821c9f68d6c13533220de428f0d036dd7 (patch) | |
tree | ab368d8fba08a87a83e9c96e1257fef40871d191 /OpenSim/Region/Framework | |
parent | recover PermissionsUtil.ApplyFoldedPermissions (well my version). its use ea... (diff) | |
download | opensim-SC_OLD-522695c821c9f68d6c13533220de428f0d036dd7.zip opensim-SC_OLD-522695c821c9f68d6c13533220de428f0d036dd7.tar.gz opensim-SC_OLD-522695c821c9f68d6c13533220de428f0d036dd7.tar.bz2 opensim-SC_OLD-522695c821c9f68d6c13533220de428f0d036dd7.tar.xz |
update folded permitions if taking from world, or after unfold
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 5e19a8a..0549571 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -1272,14 +1272,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
1272 | { | 1272 | { |
1273 | uint perms = agentItem.BasePermissions; | 1273 | uint perms = agentItem.BasePermissions; |
1274 | PermissionsUtil.ApplyFoldedPermissions(taskItem.CurrentPermissions, ref perms ); | 1274 | PermissionsUtil.ApplyFoldedPermissions(taskItem.CurrentPermissions, ref perms ); |
1275 | agentItem.BasePermissions = perms; | 1275 | // perms |= (uint)PermissionMask.Move; |
1276 | // agentItem.BasePermissions = perms; | ||
1277 | agentItem.BasePermissions = PermissionsUtil.FixAndFoldPermissions(perms); | ||
1276 | } | 1278 | } |
1277 | else | 1279 | else |
1278 | agentItem.BasePermissions &= taskItem.CurrentPermissions; | 1280 | agentItem.BasePermissions &= taskItem.CurrentPermissions; |
1279 | 1281 | ||
1280 | // always unlock | 1282 | // always unlock |
1281 | agentItem.BasePermissions |= (uint)PermissionMask.Move; | 1283 | agentItem.BasePermissions |= (uint)PermissionMask.Move; |
1282 | 1284 | ||
1283 | agentItem.CurrentPermissions = agentItem.BasePermissions; | 1285 | agentItem.CurrentPermissions = agentItem.BasePermissions; |
1284 | 1286 | ||
1285 | agentItem.Flags |= (uint)InventoryItemFlags.ObjectSlamPerm; | 1287 | agentItem.Flags |= (uint)InventoryItemFlags.ObjectSlamPerm; |