diff options
| author | UbitUmarov | 2017-01-14 14:19:58 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-14 14:21:50 +0000 |
| commit | fb86e415615ddfd917485daf5e4a4f2f0486359f (patch) | |
| tree | cfad6c25fe2d253ae970d089c54236a5fc2187d9 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | fix: send viewers the Everyone permitions of items inside other objects (diff) | |
| download | opensim-SC_OLD-fb86e415615ddfd917485daf5e4a4f2f0486359f.zip opensim-SC_OLD-fb86e415615ddfd917485daf5e4a4f2f0486359f.tar.gz opensim-SC_OLD-fb86e415615ddfd917485daf5e4a4f2f0486359f.tar.bz2 opensim-SC_OLD-fb86e415615ddfd917485daf5e4a4f2f0486359f.tar.xz | |
fix incoerent definition of Slam bit (bits 3 and 4 used in diferent
places.) this may still be wrong on other places; Do not loose folded
permitions, WARNING MASTER IS NOW UNSTABLE. permissions are still broken"
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index b8ac089..557b55e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -5181,7 +5181,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter | |||
| 5181 | /// <param name="scene">The scene the prim is being rezzed into</param> | 5181 | /// <param name="scene">The scene the prim is being rezzed into</param> |
| 5182 | public void ApplyPermissionsOnRez(InventoryItemBase item, bool userInventory, Scene scene) | 5182 | public void ApplyPermissionsOnRez(InventoryItemBase item, bool userInventory, Scene scene) |
| 5183 | { | 5183 | { |
| 5184 | if ((OwnerID != item.Owner) || ((item.CurrentPermissions & SceneObjectGroup.SLAM) != 0) || ((item.Flags & (uint)InventoryItemFlags.ObjectSlamPerm) != 0)) | 5184 | if ((OwnerID != item.Owner) || ((item.CurrentPermissions & (uint)PermissionMask.Slam) != 0) || ((item.Flags & (uint)InventoryItemFlags.ObjectSlamPerm) != 0)) |
| 5185 | { | 5185 | { |
| 5186 | if (scene.Permissions.PropagatePermissions()) | 5186 | if (scene.Permissions.PropagatePermissions()) |
| 5187 | { | 5187 | { |