diff options
author | Melanie | 2010-07-13 20:45:16 +0100 |
---|---|---|
committer | Melanie | 2010-07-13 20:45:16 +0100 |
commit | dd14016885d9c9a411ffc19b0afb0a6771d47cad (patch) | |
tree | 872758572e7aa7322965d4f0cbbc8b1fa52b307a /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |
parent | Add CreateSelected flag onto objects rezzed from inventory (diff) | |
download | opensim-SC_OLD-dd14016885d9c9a411ffc19b0afb0a6771d47cad.zip opensim-SC_OLD-dd14016885d9c9a411ffc19b0afb0a6771d47cad.tar.gz opensim-SC_OLD-dd14016885d9c9a411ffc19b0afb0a6771d47cad.tar.bz2 opensim-SC_OLD-dd14016885d9c9a411ffc19b0afb0a6771d47cad.tar.xz |
Revamp the permissions propagation. This MAY mess up. Please test.
Change the slam bit from 3 to 4. Assume the old slam bit is always set.
The new slam bit is a "changed owner" bit, correcting a bug where an item
passed from the creator to another with less than full perms, then back (sale
test) would arrive back full perm. Lots of in-code docs.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 3a8f168..cabcf37 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
@@ -952,7 +952,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
952 | item.CurrentPermissions &= ~(uint)PermissionMask.Transfer; | 952 | item.CurrentPermissions &= ~(uint)PermissionMask.Transfer; |
953 | if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0) | 953 | if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0) |
954 | item.CurrentPermissions &= ~(uint)PermissionMask.Modify; | 954 | item.CurrentPermissions &= ~(uint)PermissionMask.Modify; |
955 | item.CurrentPermissions |= 8; | ||
956 | } | 955 | } |
957 | item.CurrentPermissions &= item.NextPermissions; | 956 | item.CurrentPermissions &= item.NextPermissions; |
958 | item.BasePermissions &= item.NextPermissions; | 957 | item.BasePermissions &= item.NextPermissions; |