aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Objects
diff options
context:
space:
mode:
authorUbitUmarov2017-01-22 23:05:39 +0000
committerUbitUmarov2017-01-22 23:05:39 +0000
commitc673ef7e3cd5d9bb4d06094229d5a0647f49a36e (patch)
tree6d4db4cc8b12b6491e6c0c4bc893ec38f4958c64 /OpenSim/Region/CoreModules/World/Objects
parentdon't let part lastowner be the group (diff)
downloadopensim-SC_OLD-c673ef7e3cd5d9bb4d06094229d5a0647f49a36e.zip
opensim-SC_OLD-c673ef7e3cd5d9bb4d06094229d5a0647f49a36e.tar.gz
opensim-SC_OLD-c673ef7e3cd5d9bb4d06094229d5a0647f49a36e.tar.bz2
opensim-SC_OLD-c673ef7e3cd5d9bb4d06094229d5a0647f49a36e.tar.xz
replace calls to SOG.GetEffectivePermissions() by the new SOG.EffectiveOwnerPerms, some of those inline permissions checks should be reviewed and pass by permissions module
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Objects')
-rw-r--r--OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs4
1 files changed, 2 insertions, 2 deletions
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 {