aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs50
1 files changed, 10 insertions, 40 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 660deaf..c1522bc 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -44,12 +44,12 @@ namespace OpenSim.Region.Environment.Scenes
44{ 44{
45 public partial class SceneObjectPart : IScriptHost 45 public partial class SceneObjectPart : IScriptHost
46 { 46 {
47 private const LLObject.ObjectFlags OBJFULL_MASK_GENERAL = 47 private const PermissionMask OBJFULL_MASK_GENERAL =
48 LLObject.ObjectFlags.ObjectCopy | LLObject.ObjectFlags.ObjectModify | LLObject.ObjectFlags.ObjectTransfer; 48 PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer | PermissionMask.Move;
49 49
50 private const LLObject.ObjectFlags OBJFULL_MASK_OWNER = 50 private const PermissionMask OBJFULL_MASK_OWNER =
51 LLObject.ObjectFlags.ObjectCopy | LLObject.ObjectFlags.ObjectModify | LLObject.ObjectFlags.ObjectOwnerModify | 51 PermissionMask.Copy | PermissionMask.Modify |
52 LLObject.ObjectFlags.ObjectTransfer | LLObject.ObjectFlags.ObjectYouOwner; 52 PermissionMask.Transfer;
53 53
54 private const uint OBJNEXT_OWNER = 2147483647; 54 private const uint OBJNEXT_OWNER = 2147483647;
55 55
@@ -76,10 +76,10 @@ namespace OpenSim.Region.Environment.Scenes
76 // 76 //
77 // Main grid has default permissions as follows 77 // Main grid has default permissions as follows
78 // 78 //
79 public uint OwnerMask = FULL_MASK_PERMISSIONS_OWNER; 79 public uint OwnerMask =(uint) PermissionMask.All;
80 public uint NextOwnerMask = OBJNEXT_OWNER; 80 public uint NextOwnerMask = OBJNEXT_OWNER;
81 public uint GroupMask = (uint) LLObject.ObjectFlags.None; 81 public uint GroupMask = (uint) PermissionMask.None;
82 public uint EveryoneMask = (uint) LLObject.ObjectFlags.None; 82 public uint EveryoneMask = (uint)PermissionMask.None;
83 public uint BaseMask = FULL_MASK_PERMISSIONS_OWNER; 83 public uint BaseMask = FULL_MASK_PERMISSIONS_OWNER;
84 84
85 protected byte[] m_particleSystem = new byte[0]; 85 protected byte[] m_particleSystem = new byte[0];
@@ -697,21 +697,7 @@ namespace OpenSim.Region.Environment.Scenes
697 public void ApplySanePermissions() 697 public void ApplySanePermissions()
698 { 698 {
699 // These are some flags that The OwnerMask should never have 699 // These are some flags that The OwnerMask should never have
700 OwnerMask &= ~(uint) LLObject.ObjectFlags.ObjectGroupOwned; 700
701 OwnerMask &= ~(uint) LLObject.ObjectFlags.Physics;
702 OwnerMask &= ~(uint) LLObject.ObjectFlags.Phantom;
703 OwnerMask &= ~(uint) LLObject.ObjectFlags.Scripted;
704 OwnerMask &= ~(uint) LLObject.ObjectFlags.Touch;
705 OwnerMask &= ~(uint) LLObject.ObjectFlags.Temporary;
706 OwnerMask &= ~(uint) LLObject.ObjectFlags.TemporaryOnRez;
707 OwnerMask &= ~(uint) LLObject.ObjectFlags.ZlibCompressed;
708 OwnerMask &= ~(uint) LLObject.ObjectFlags.AllowInventoryDrop;
709 OwnerMask &= ~(uint) LLObject.ObjectFlags.AnimSource;
710 OwnerMask &= ~(uint) LLObject.ObjectFlags.Money;
711 OwnerMask &= ~(uint) LLObject.ObjectFlags.CastShadows;
712 OwnerMask &= ~(uint) LLObject.ObjectFlags.InventoryEmpty;
713 OwnerMask &= ~(uint) LLObject.ObjectFlags.CreateSelected;
714
715 701
716 // These are some flags that the next owner mask should never have 702 // These are some flags that the next owner mask should never have
717 NextOwnerMask &= ~(uint) LLObject.ObjectFlags.ObjectYouOwner; 703 NextOwnerMask &= ~(uint) LLObject.ObjectFlags.ObjectYouOwner;
@@ -754,23 +740,7 @@ namespace OpenSim.Region.Environment.Scenes
754 740
755 741
756 // These are some flags that EveryoneMask should never have 742 // These are some flags that EveryoneMask should never have
757 EveryoneMask &= ~(uint) LLObject.ObjectFlags.ObjectYouOwner; 743 //EveryoneMask = (uint)OBJFULL_MASK_EVERYONE;
758 EveryoneMask &= ~(uint) LLObject.ObjectFlags.ObjectTransfer;
759 EveryoneMask &= ~(uint) LLObject.ObjectFlags.ObjectOwnerModify;
760 EveryoneMask &= ~(uint) LLObject.ObjectFlags.ObjectGroupOwned;
761 EveryoneMask &= ~(uint) LLObject.ObjectFlags.Physics;
762 EveryoneMask &= ~(uint) LLObject.ObjectFlags.Phantom;
763 EveryoneMask &= ~(uint) LLObject.ObjectFlags.Scripted;
764 EveryoneMask &= ~(uint) LLObject.ObjectFlags.Touch;
765 EveryoneMask &= ~(uint) LLObject.ObjectFlags.Temporary;
766 EveryoneMask &= ~(uint) LLObject.ObjectFlags.TemporaryOnRez;
767 EveryoneMask &= ~(uint) LLObject.ObjectFlags.ZlibCompressed;
768 EveryoneMask &= ~(uint) LLObject.ObjectFlags.AllowInventoryDrop;
769 EveryoneMask &= ~(uint) LLObject.ObjectFlags.AnimSource;
770 EveryoneMask &= ~(uint) LLObject.ObjectFlags.Money;
771 EveryoneMask &= ~(uint) LLObject.ObjectFlags.CastShadows;
772 EveryoneMask &= ~(uint) LLObject.ObjectFlags.InventoryEmpty;
773 EveryoneMask &= ~(uint) LLObject.ObjectFlags.CreateSelected;
774 744
775 745
776 // These are some flags that ObjectFlags (m_flags) should never have 746 // These are some flags that ObjectFlags (m_flags) should never have