diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 1857757..49b771f 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -4468,7 +4468,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
4468 | if (god) | 4468 | if (god) |
4469 | { | 4469 | { |
4470 | BaseMask = ApplyMask(BaseMask, set, mask); | 4470 | BaseMask = ApplyMask(BaseMask, set, mask); |
4471 | Inventory.ApplyGodPermissions(_baseMask); | 4471 | Inventory.ApplyGodPermissions(BaseMask); |
4472 | } | 4472 | } |
4473 | 4473 | ||
4474 | break; | 4474 | break; |
@@ -4487,7 +4487,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
4487 | case 16: | 4487 | case 16: |
4488 | NextOwnerMask = ApplyMask(NextOwnerMask, set, mask) & | 4488 | NextOwnerMask = ApplyMask(NextOwnerMask, set, mask) & |
4489 | baseMask; | 4489 | baseMask; |
4490 | // Prevent the client from creating no mod, no copy | 4490 | // Prevent the client from creating no copy, no transfer |
4491 | // objects | 4491 | // objects |
4492 | if ((NextOwnerMask & (uint)PermissionMask.Copy) == 0) | 4492 | if ((NextOwnerMask & (uint)PermissionMask.Copy) == 0) |
4493 | NextOwnerMask |= (uint)PermissionMask.Transfer; | 4493 | NextOwnerMask |= (uint)PermissionMask.Transfer; |
@@ -4505,20 +4505,20 @@ namespace OpenSim.Region.Framework.Scenes | |||
4505 | { | 4505 | { |
4506 | bool update = false; | 4506 | bool update = false; |
4507 | 4507 | ||
4508 | if (BaseMask != source.BaseMask || | 4508 | uint prevOwnerMask = OwnerMask; |
4509 | OwnerMask != source.OwnerMask || | 4509 | uint prevGroupMask = GroupMask; |
4510 | GroupMask != source.GroupMask || | 4510 | uint prevEveryoneMask = EveryoneMask; |
4511 | EveryoneMask != source.EveryoneMask || | 4511 | uint prevNextOwnerMask = NextOwnerMask; |
4512 | NextOwnerMask != source.NextOwnerMask) | ||
4513 | update = true; | ||
4514 | 4512 | ||
4515 | BaseMask = source.BaseMask; | 4513 | OwnerMask = source.OwnerMask & BaseMask; |
4516 | OwnerMask = source.OwnerMask; | 4514 | GroupMask = source.GroupMask & BaseMask; |
4517 | GroupMask = source.GroupMask; | 4515 | EveryoneMask = source.EveryoneMask & BaseMask; |
4518 | EveryoneMask = source.EveryoneMask; | 4516 | NextOwnerMask = source.NextOwnerMask & BaseMask; |
4519 | NextOwnerMask = source.NextOwnerMask; | ||
4520 | 4517 | ||
4521 | if (update) | 4518 | if (OwnerMask != prevOwnerMask || |
4519 | GroupMask != prevGroupMask || | ||
4520 | EveryoneMask != prevEveryoneMask || | ||
4521 | NextOwnerMask != prevNextOwnerMask) | ||
4522 | SendFullUpdateToAllClients(); | 4522 | SendFullUpdateToAllClients(); |
4523 | } | 4523 | } |
4524 | 4524 | ||