diff options
author | UbitUmarov | 2017-05-01 14:18:59 +0100 |
---|---|---|
committer | UbitUmarov | 2017-05-01 14:18:59 +0100 |
commit | 60dc124872c52fb50cbf2f4413bd8813e50c527b (patch) | |
tree | f08a364f4e55b84fced61c54c9ac6d97ea0acbcc /OpenSim/Region/CoreModules/World | |
parent | Permissions compatibility hack 1: anyone copy - new permissions require that ... (diff) | |
download | opensim-SC_OLD-60dc124872c52fb50cbf2f4413bd8813e50c527b.zip opensim-SC_OLD-60dc124872c52fb50cbf2f4413bd8813e50c527b.tar.gz opensim-SC_OLD-60dc124872c52fb50cbf2f4413bd8813e50c527b.tar.bz2 opensim-SC_OLD-60dc124872c52fb50cbf2f4413bd8813e50c527b.tar.xz |
rename sog.GetEffectivePermissions() since its use is now limited to more specific task, and no longer on current effective(full) path. Note that change ownermask start to be current ownermask, and filter it to all parts basemask
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs index 6854b53..d1a109e 100644 --- a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs +++ b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs | |||
@@ -206,12 +206,12 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell | |||
206 | item.InvType = (int)InventoryType.Object; | 206 | item.InvType = (int)InventoryType.Object; |
207 | item.Folder = categoryID; | 207 | item.Folder = categoryID; |
208 | 208 | ||
209 | perms = group.GetEffectivePermissions(false); | 209 | perms = group.CurrentAndFoldedNextPermissions(); |
210 | 210 | // apply parts inventory next perms | |
211 | PermissionsUtil.ApplyNoModFoldedPermissions(perms, ref perms); | 211 | PermissionsUtil.ApplyNoModFoldedPermissions(perms, ref perms); |
212 | 212 | // change to next owner perms | |
213 | perms &= part.NextOwnerMask; | 213 | perms &= part.NextOwnerMask; |
214 | 214 | // update folded | |
215 | perms = PermissionsUtil.FixAndFoldPermissions(perms); | 215 | perms = PermissionsUtil.FixAndFoldPermissions(perms); |
216 | 216 | ||
217 | item.BasePermissions = perms; | 217 | item.BasePermissions = perms; |