aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs42
1 files changed, 21 insertions, 21 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
index 841b7b6..480c030 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -526,8 +526,8 @@ namespace OpenSim.Region.Environment.Scenes
526 { 526 {
527 LLUUID ownerID = item.OwnerID; 527 LLUUID ownerID = item.OwnerID;
528 uint everyoneMask = 0; 528 uint everyoneMask = 0;
529 uint baseMask = item.BaseMask; 529 uint baseMask = item.BasePermissions;
530 uint ownerMask = item.OwnerMask; 530 uint ownerMask = item.CurrentPermissions;
531 531
532 if (item.InvType == 10) // Script 532 if (item.InvType == 10) // Script
533 { 533 {
@@ -557,7 +557,7 @@ namespace OpenSim.Region.Environment.Scenes
557 invString.AddNameValueLine("owner_mask", Helpers.UIntToHexString(ownerMask)); 557 invString.AddNameValueLine("owner_mask", Helpers.UIntToHexString(ownerMask));
558 invString.AddNameValueLine("group_mask", Helpers.UIntToHexString(0)); 558 invString.AddNameValueLine("group_mask", Helpers.UIntToHexString(0));
559 invString.AddNameValueLine("everyone_mask", Helpers.UIntToHexString(everyoneMask)); 559 invString.AddNameValueLine("everyone_mask", Helpers.UIntToHexString(everyoneMask));
560 invString.AddNameValueLine("next_owner_mask", Helpers.UIntToHexString(item.NextOwnerMask)); 560 invString.AddNameValueLine("next_owner_mask", Helpers.UIntToHexString(item.NextPermissions));
561 561
562 invString.AddNameValueLine("creator_id", item.CreatorID.ToString()); 562 invString.AddNameValueLine("creator_id", item.CreatorID.ToString());
563 invString.AddNameValueLine("owner_id", ownerID.ToString()); 563 invString.AddNameValueLine("owner_id", ownerID.ToString());
@@ -680,28 +680,28 @@ namespace OpenSim.Region.Environment.Scenes
680 { 680 {
681 if (item.InvType != 6) 681 if (item.InvType != 6)
682 { 682 {
683 if ((item.OwnerMask & item.NextOwnerMask & (uint)PermissionMask.Copy) == 0) 683 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Copy) == 0)
684 mask &= ~((uint)PermissionMask.Copy >> 13); 684 mask &= ~((uint)PermissionMask.Copy >> 13);
685 if ((item.OwnerMask & item.NextOwnerMask & (uint)PermissionMask.Transfer) == 0) 685 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Transfer) == 0)
686 mask &= ~((uint)PermissionMask.Transfer >> 13); 686 mask &= ~((uint)PermissionMask.Transfer >> 13);
687 if ((item.OwnerMask & item.NextOwnerMask & (uint)PermissionMask.Modify) == 0) 687 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Modify) == 0)
688 mask &= ~((uint)PermissionMask.Modify >> 13); 688 mask &= ~((uint)PermissionMask.Modify >> 13);
689 } 689 }
690 else 690 else
691 { 691 {
692 if ((item.OwnerMask & ((uint)PermissionMask.Copy >> 13)) == 0) 692 if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0)
693 mask &= ~((uint)PermissionMask.Copy >> 13); 693 mask &= ~((uint)PermissionMask.Copy >> 13);
694 if ((item.OwnerMask & ((uint)PermissionMask.Transfer >> 13)) == 0) 694 if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0)
695 mask &= ~((uint)PermissionMask.Transfer >> 13); 695 mask &= ~((uint)PermissionMask.Transfer >> 13);
696 if ((item.OwnerMask & ((uint)PermissionMask.Modify >> 13)) == 0) 696 if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0)
697 mask &= ~((uint)PermissionMask.Modify >> 13); 697 mask &= ~((uint)PermissionMask.Modify >> 13);
698 } 698 }
699 699
700 if ((item.OwnerMask & (uint)PermissionMask.Copy) == 0) 700 if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
701 mask &= ~(uint)PermissionMask.Copy; 701 mask &= ~(uint)PermissionMask.Copy;
702 if ((item.OwnerMask & (uint)PermissionMask.Transfer) == 0) 702 if ((item.CurrentPermissions & (uint)PermissionMask.Transfer) == 0)
703 mask &= ~(uint)PermissionMask.Transfer; 703 mask &= ~(uint)PermissionMask.Transfer;
704 if ((item.OwnerMask & (uint)PermissionMask.Modify) == 0) 704 if ((item.CurrentPermissions & (uint)PermissionMask.Modify) == 0)
705 mask &= ~(uint)PermissionMask.Modify; 705 mask &= ~(uint)PermissionMask.Modify;
706 } 706 }
707 return mask; 707 return mask;
@@ -717,16 +717,16 @@ namespace OpenSim.Region.Environment.Scenes
717 { 717 {
718 if (item.InvType == 6) 718 if (item.InvType == 6)
719 { 719 {
720 if ((item.OwnerMask & ((uint)PermissionMask.Copy >> 13)) == 0) 720 if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0)
721 item.OwnerMask &= ~(uint)PermissionMask.Copy; 721 item.CurrentPermissions &= ~(uint)PermissionMask.Copy;
722 if ((item.OwnerMask & ((uint)PermissionMask.Transfer >> 13)) == 0) 722 if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0)
723 item.OwnerMask &= ~(uint)PermissionMask.Transfer; 723 item.CurrentPermissions &= ~(uint)PermissionMask.Transfer;
724 if ((item.OwnerMask & ((uint)PermissionMask.Modify >> 13)) == 0) 724 if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0)
725 item.OwnerMask &= ~(uint)PermissionMask.Modify; 725 item.CurrentPermissions &= ~(uint)PermissionMask.Modify;
726 } 726 }
727 item.OwnerMask &= item.NextOwnerMask; 727 item.CurrentPermissions &= item.NextPermissions;
728 item.BaseMask &= item.NextOwnerMask; 728 item.BasePermissions &= item.NextPermissions;
729 item.EveryoneMask &= item.NextOwnerMask; 729 item.EveryonePermissions &= item.NextPermissions;
730 } 730 }
731 731
732 TriggerScriptChangedEvent(Changed.OWNER); 732 TriggerScriptChangedEvent(Changed.OWNER);