OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't break groups permission mask

httptests
UbitUmarov 2017-04-30 00:14:45 +01:00
parent d8341588b3
commit 116d32d947
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@ -1283,8 +1283,7 @@ namespace OpenSim.Region.Framework.Scenes
agentItem.CurrentPermissions = perms; agentItem.CurrentPermissions = perms;
agentItem.NextPermissions = perms & taskItem.NextPermissions; agentItem.NextPermissions = perms & taskItem.NextPermissions;
agentItem.EveryOnePermissions = perms & taskItem.EveryonePermissions; agentItem.EveryOnePermissions = perms & taskItem.EveryonePermissions;
// Group permissions make no sense here agentItem.GroupPermissions = perms & taskItem.GroupPermissions;
agentItem.GroupPermissions = 0;
agentItem.Flags |= (uint)InventoryItemFlags.ObjectSlamPerm; agentItem.Flags |= (uint)InventoryItemFlags.ObjectSlamPerm;
agentItem.Flags &= ~(uint)(InventoryItemFlags.ObjectOverwriteBase | InventoryItemFlags.ObjectOverwriteOwner | InventoryItemFlags.ObjectOverwriteGroup | InventoryItemFlags.ObjectOverwriteEveryone | InventoryItemFlags.ObjectOverwriteNextOwner); agentItem.Flags &= ~(uint)(InventoryItemFlags.ObjectOverwriteBase | InventoryItemFlags.ObjectOverwriteOwner | InventoryItemFlags.ObjectOverwriteGroup | InventoryItemFlags.ObjectOverwriteEveryone | InventoryItemFlags.ObjectOverwriteNextOwner);
@ -1295,7 +1294,7 @@ namespace OpenSim.Region.Framework.Scenes
agentItem.CurrentPermissions = taskItem.CurrentPermissions; agentItem.CurrentPermissions = taskItem.CurrentPermissions;
agentItem.NextPermissions = taskItem.NextPermissions; agentItem.NextPermissions = taskItem.NextPermissions;
agentItem.EveryOnePermissions = taskItem.EveryonePermissions; agentItem.EveryOnePermissions = taskItem.EveryonePermissions;
agentItem.GroupPermissions = 0; agentItem.GroupPermissions = taskItem.GroupPermissions;
} }
message = null; message = null;