diff options
author | Robert Adams | 2014-01-11 08:52:23 -0800 |
---|---|---|
committer | Robert Adams | 2014-01-11 08:52:23 -0800 |
commit | 1cf17a3cf7322b79d44ef80b9129c975f0cf4f6f (patch) | |
tree | 125392101f83c8e7cb239848ae7a6cc12595b1a2 /OpenSim/Region/CoreModules/World/Objects | |
parent | Merge branch 'master' into varregion (diff) | |
parent | Fix crash in BulletSim which sometimes happens making a linkset physical (diff) | |
download | opensim-SC_OLD-1cf17a3cf7322b79d44ef80b9129c975f0cf4f6f.zip opensim-SC_OLD-1cf17a3cf7322b79d44ef80b9129c975f0cf4f6f.tar.gz opensim-SC_OLD-1cf17a3cf7322b79d44ef80b9129c975f0cf4f6f.tar.bz2 opensim-SC_OLD-1cf17a3cf7322b79d44ef80b9129c975f0cf4f6f.tar.xz |
Merge branch 'master' into varregion
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneBase.cs
OpenSim/Services/Interfaces/IGridService.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
(conflicts were debug statements that are commented out in master branch)
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Objects')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs index e8eaeb7..b8d4855 100644 --- a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs +++ b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs | |||
@@ -193,13 +193,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell | |||
193 | item.InvType = (int)InventoryType.Object; | 193 | item.InvType = (int)InventoryType.Object; |
194 | item.Folder = categoryID; | 194 | item.Folder = categoryID; |
195 | 195 | ||
196 | uint nextPerms=(perms & 7) << 13; | 196 | PermissionsUtil.ApplyFoldedPermissions(perms, ref perms); |
197 | if ((nextPerms & (uint)PermissionMask.Copy) == 0) | ||
198 | perms &= ~(uint)PermissionMask.Copy; | ||
199 | if ((nextPerms & (uint)PermissionMask.Transfer) == 0) | ||
200 | perms &= ~(uint)PermissionMask.Transfer; | ||
201 | if ((nextPerms & (uint)PermissionMask.Modify) == 0) | ||
202 | perms &= ~(uint)PermissionMask.Modify; | ||
203 | 197 | ||
204 | item.BasePermissions = perms & part.NextOwnerMask; | 198 | item.BasePermissions = perms & part.NextOwnerMask; |
205 | item.CurrentPermissions = perms & part.NextOwnerMask; | 199 | item.CurrentPermissions = perms & part.NextOwnerMask; |