diff options
| author | Justin Clark-Casey (justincc) | 2010-07-14 17:13:04 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-07-14 17:13:04 +0100 |
| commit | 0080c3b1f4467224885323e7198c91d7e221f75b (patch) | |
| tree | 82fcfd5dd7fd3c9df8c467e5a423b792357384b3 /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |
| parent | Fix obvious bug in XInventoryService.GetFolderItems() which was preventing th... (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-0080c3b1f4467224885323e7198c91d7e221f75b.zip opensim-SC-0080c3b1f4467224885323e7198c91d7e221f75b.tar.gz opensim-SC-0080c3b1f4467224885323e7198c91d7e221f75b.tar.bz2 opensim-SC-0080c3b1f4467224885323e7198c91d7e221f75b.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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; |