diff options
| author | Kitto Flora | 2010-07-13 20:37:45 +0000 |
|---|---|---|
| committer | Kitto Flora | 2010-07-13 20:37:45 +0000 |
| commit | 84227fd55852391dae6f2e162c4b0a852ee24f13 (patch) | |
| tree | f3472e0268397366fdf6096bf4e925f9002d24dd /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |
| parent | Rewrite collision dictionary handling, cleans up deleted obects/avs. Fixes oc... (diff) | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC-84227fd55852391dae6f2e162c4b0a852ee24f13.zip opensim-SC-84227fd55852391dae6f2e162c4b0a852ee24f13.tar.gz opensim-SC-84227fd55852391dae6f2e162c4b0a852ee24f13.tar.bz2 opensim-SC-84227fd55852391dae6f2e162c4b0a852ee24f13.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
| -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 2cde8f3..0066158 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
| @@ -1082,7 +1082,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1082 | item.CurrentPermissions &= ~(uint)PermissionMask.Transfer; | 1082 | item.CurrentPermissions &= ~(uint)PermissionMask.Transfer; |
| 1083 | if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0) | 1083 | if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0) |
| 1084 | item.CurrentPermissions &= ~(uint)PermissionMask.Modify; | 1084 | item.CurrentPermissions &= ~(uint)PermissionMask.Modify; |
| 1085 | item.CurrentPermissions |= 8; | ||
| 1086 | } | 1085 | } |
| 1087 | item.OwnerChanged = true; | 1086 | item.OwnerChanged = true; |
| 1088 | item.CurrentPermissions &= item.NextPermissions; | 1087 | item.CurrentPermissions &= item.NextPermissions; |