diff options
| author | Melanie Thielker | 2008-11-28 01:07:22 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-11-28 01:07:22 +0000 |
| commit | 48149f36c0b425c80ef1d9efa3ac6398d00e87d0 (patch) | |
| tree | 4ae11b5664a495dc8a37365fc02b93a0d201f271 /OpenSim | |
| parent | Fix build break (diff) | |
| download | opensim-SC-48149f36c0b425c80ef1d9efa3ac6398d00e87d0.zip opensim-SC-48149f36c0b425c80ef1d9efa3ac6398d00e87d0.tar.gz opensim-SC-48149f36c0b425c80ef1d9efa3ac6398d00e87d0.tar.bz2 opensim-SC-48149f36c0b425c80ef1d9efa3ac6398d00e87d0.tar.xz | |
Reinstate a check that i overzealously removed. Permissions are not slammed
without owner change anymore
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 3e4663d..77ac121 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
| @@ -975,7 +975,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 975 | agentItem.InvType = taskItem.InvType; | 975 | agentItem.InvType = taskItem.InvType; |
| 976 | agentItem.Flags = taskItem.Flags; | 976 | agentItem.Flags = taskItem.Flags; |
| 977 | 977 | ||
| 978 | if (Permissions.PropagatePermissions()) | 978 | if ((part.OwnerID != destAgent) && Permissions.PropagatePermissions()) |
| 979 | { | 979 | { |
| 980 | agentItem.BasePermissions = taskItem.NextPermissions; | 980 | agentItem.BasePermissions = taskItem.NextPermissions; |
| 981 | agentItem.CurrentPermissions = taskItem.NextPermissions | 8; | 981 | agentItem.CurrentPermissions = taskItem.NextPermissions | 8; |