aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework/InventoryAccess
diff options
context:
space:
mode:
authorMelanie Thielker2017-01-16 14:53:42 +0000
committerMelanie Thielker2017-01-16 14:53:42 +0000
commit568614af2cee0c9e6cd86dd682c7bc768afe655b (patch)
treead04210b5c1cf9f3e61e6cd12f775eb5fbaeba74 /OpenSim/Region/CoreModules/Framework/InventoryAccess
parentuse of PermissionMask Bit3 for slam was a recent mistake, so make it only bit... (diff)
downloadopensim-SC_OLD-568614af2cee0c9e6cd86dd682c7bc768afe655b.zip
opensim-SC_OLD-568614af2cee0c9e6cd86dd682c7bc768afe655b.tar.gz
opensim-SC_OLD-568614af2cee0c9e6cd86dd682c7bc768afe655b.tar.bz2
opensim-SC_OLD-568614af2cee0c9e6cd86dd682c7bc768afe655b.tar.xz
Remove the last instance of the legacy slam but being set
New objects now get only the real slam bit.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/InventoryAccess')
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 6fe7e89..b37744d 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -608,7 +608,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
608 608
609// item.BasePermissions = perms & so.RootPart.NextOwnerMask; 609// item.BasePermissions = perms & so.RootPart.NextOwnerMask;
610 610
611 uint nextp = so.RootPart.NextOwnerMask | 0x0f; 611 uint nextp = so.RootPart.NextOwnerMask | (uint)PermissionMask.FoldedMask;
612 item.BasePermissions = perms & nextp; 612 item.BasePermissions = perms & nextp;
613 item.CurrentPermissions = item.BasePermissions; 613 item.CurrentPermissions = item.BasePermissions;
614 item.NextPermissions = perms & so.RootPart.NextOwnerMask; 614 item.NextPermissions = perms & so.RootPart.NextOwnerMask;
@@ -616,7 +616,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
616 item.GroupPermissions = so.RootPart.GroupMask & so.RootPart.NextOwnerMask; 616 item.GroupPermissions = so.RootPart.GroupMask & so.RootPart.NextOwnerMask;
617 617
618 // apply next owner perms on rez 618 // apply next owner perms on rez
619 item.CurrentPermissions |= (uint)PermissionMask.Slam; 619 item.Flags |= (uint)InventoryItemFlags.ObjectSlamPerm;
620 } 620 }
621 else 621 else
622 { 622 {