diff options
Diffstat (limited to '')
4 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 3aca741..8c0edc8 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
@@ -1650,7 +1650,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1650 | foreach (SceneObjectGroup obj in primsOverMe) | 1650 | foreach (SceneObjectGroup obj in primsOverMe) |
1651 | { | 1651 | { |
1652 | if (obj.OwnerID == previousOwner && obj.GroupID == UUID.Zero && | 1652 | if (obj.OwnerID == previousOwner && obj.GroupID == UUID.Zero && |
1653 | (obj.GetEffectivePermissions() & (uint)(OpenSim.Framework.PermissionMask.Transfer)) != 0) | 1653 | (obj.EffectiveOwnerPerms & (uint)(OpenSim.Framework.PermissionMask.Transfer)) != 0) |
1654 | m_BuySellModule.BuyObject(sp.ControllingClient, UUID.Zero, obj.LocalId, 1, 0); | 1654 | m_BuySellModule.BuyObject(sp.ControllingClient, UUID.Zero, obj.LocalId, 1, 0); |
1655 | } | 1655 | } |
1656 | } | 1656 | } |
diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs index 4542bbf..504a584 100644 --- a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs +++ b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs | |||
@@ -127,7 +127,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell | |||
127 | switch (saleType) | 127 | switch (saleType) |
128 | { | 128 | { |
129 | case 1: // Sell as original (in-place sale) | 129 | case 1: // Sell as original (in-place sale) |
130 | uint effectivePerms = group.GetEffectivePermissions(); | 130 | uint effectivePerms = group.EffectiveOwnerPerms; |
131 | 131 | ||
132 | if ((effectivePerms & (uint)PermissionMask.Transfer) == 0) | 132 | if ((effectivePerms & (uint)PermissionMask.Transfer) == 0) |
133 | { | 133 | { |
@@ -174,7 +174,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell | |||
174 | string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(group); | 174 | string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(group); |
175 | group.AbsolutePosition = originalPosition; | 175 | group.AbsolutePosition = originalPosition; |
176 | 176 | ||
177 | uint perms = group.GetEffectivePermissions(); | 177 | uint perms = group.EffectiveOwnerPerms; |
178 | 178 | ||
179 | if ((perms & (uint)PermissionMask.Transfer) == 0) | 179 | if ((perms & (uint)PermissionMask.Transfer) == 0) |
180 | { | 180 | { |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index ca298be..4fca4ed 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2770,7 +2770,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2770 | SceneObjectGroup sog = (SceneObjectGroup)e; | 2770 | SceneObjectGroup sog = (SceneObjectGroup)e; |
2771 | if (sog != null && !sog.IsAttachment) | 2771 | if (sog != null && !sog.IsAttachment) |
2772 | { | 2772 | { |
2773 | if (!exceptNoCopy || ((sog.GetEffectivePermissions() & (uint)PermissionMask.Copy) != 0)) | 2773 | if (!exceptNoCopy || ((sog.EffectiveOwnerPerms & (uint)PermissionMask.Copy) != 0)) |
2774 | { | 2774 | { |
2775 | DeleteSceneObject((SceneObjectGroup)e, false); | 2775 | DeleteSceneObject((SceneObjectGroup)e, false); |
2776 | } | 2776 | } |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs b/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs index 2bb48ad..92b5831 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs | |||
@@ -159,7 +159,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments | |||
159 | 159 | ||
160 | if (target.UUID != hostgroup.OwnerID) | 160 | if (target.UUID != hostgroup.OwnerID) |
161 | { | 161 | { |
162 | uint effectivePerms = hostgroup.GetEffectivePermissions(); | 162 | uint effectivePerms = hostgroup.EffectiveOwnerPerms; |
163 | 163 | ||
164 | if ((effectivePerms & (uint)PermissionMask.Transfer) == 0) | 164 | if ((effectivePerms & (uint)PermissionMask.Transfer) == 0) |
165 | return 0; | 165 | return 0; |