diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs index bec1300..3dddc2b 100644 --- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs | |||
@@ -732,40 +732,40 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
732 | 732 | ||
733 | public uint GetRegionFlags() | 733 | public uint GetRegionFlags() |
734 | { | 734 | { |
735 | Simulator.RegionFlags flags = Simulator.RegionFlags.None; | 735 | RegionFlags flags = RegionFlags.None; |
736 | 736 | ||
737 | // Fully implemented | 737 | // Fully implemented |
738 | // | 738 | // |
739 | if (m_scene.RegionInfo.RegionSettings.AllowDamage) | 739 | if (m_scene.RegionInfo.RegionSettings.AllowDamage) |
740 | flags |= Simulator.RegionFlags.AllowDamage; | 740 | flags |= RegionFlags.AllowDamage; |
741 | if (m_scene.RegionInfo.RegionSettings.BlockTerraform) | 741 | if (m_scene.RegionInfo.RegionSettings.BlockTerraform) |
742 | flags |= Simulator.RegionFlags.BlockTerraform; | 742 | flags |= RegionFlags.BlockTerraform; |
743 | if (!m_scene.RegionInfo.RegionSettings.AllowLandResell) | 743 | if (!m_scene.RegionInfo.RegionSettings.AllowLandResell) |
744 | flags |= Simulator.RegionFlags.BlockLandResell; | 744 | flags |= RegionFlags.BlockLandResell; |
745 | if (m_scene.RegionInfo.RegionSettings.DisableCollisions) | 745 | if (m_scene.RegionInfo.RegionSettings.DisableCollisions) |
746 | flags |= Simulator.RegionFlags.SkipCollisions; | 746 | flags |= RegionFlags.SkipCollisions; |
747 | if (m_scene.RegionInfo.RegionSettings.DisableScripts) | 747 | if (m_scene.RegionInfo.RegionSettings.DisableScripts) |
748 | flags |= Simulator.RegionFlags.SkipScripts; | 748 | flags |= RegionFlags.SkipScripts; |
749 | if (m_scene.RegionInfo.RegionSettings.DisablePhysics) | 749 | if (m_scene.RegionInfo.RegionSettings.DisablePhysics) |
750 | flags |= Simulator.RegionFlags.SkipPhysics; | 750 | flags |= RegionFlags.SkipPhysics; |
751 | if (m_scene.RegionInfo.RegionSettings.BlockFly) | 751 | if (m_scene.RegionInfo.RegionSettings.BlockFly) |
752 | flags |= Simulator.RegionFlags.NoFly; | 752 | flags |= RegionFlags.NoFly; |
753 | if (m_scene.RegionInfo.RegionSettings.RestrictPushing) | 753 | if (m_scene.RegionInfo.RegionSettings.RestrictPushing) |
754 | flags |= Simulator.RegionFlags.RestrictPushObject; | 754 | flags |= RegionFlags.RestrictPushObject; |
755 | if (m_scene.RegionInfo.RegionSettings.AllowLandJoinDivide) | 755 | if (m_scene.RegionInfo.RegionSettings.AllowLandJoinDivide) |
756 | flags |= Simulator.RegionFlags.AllowParcelChanges; | 756 | flags |= RegionFlags.AllowParcelChanges; |
757 | if (m_scene.RegionInfo.RegionSettings.BlockShowInSearch) | 757 | if (m_scene.RegionInfo.RegionSettings.BlockShowInSearch) |
758 | flags |= (Simulator.RegionFlags)(1 << 29); | 758 | flags |= (RegionFlags)(1 << 29); |
759 | 759 | ||
760 | if (m_scene.RegionInfo.RegionSettings.FixedSun) | 760 | if (m_scene.RegionInfo.RegionSettings.FixedSun) |
761 | flags |= Simulator.RegionFlags.SunFixed; | 761 | flags |= RegionFlags.SunFixed; |
762 | if (m_scene.RegionInfo.RegionSettings.Sandbox) | 762 | if (m_scene.RegionInfo.RegionSettings.Sandbox) |
763 | flags |= Simulator.RegionFlags.Sandbox; | 763 | flags |= RegionFlags.Sandbox; |
764 | 764 | ||
765 | // Fudge these to always on, so the menu options activate | 765 | // Fudge these to always on, so the menu options activate |
766 | // | 766 | // |
767 | flags |= Simulator.RegionFlags.AllowLandmark; | 767 | flags |= RegionFlags.AllowLandmark; |
768 | flags |= Simulator.RegionFlags.AllowSetHome; | 768 | flags |= RegionFlags.AllowSetHome; |
769 | 769 | ||
770 | // TODO: SkipUpdateInterestList | 770 | // TODO: SkipUpdateInterestList |
771 | 771 | ||
@@ -779,35 +779,35 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
779 | 779 | ||
780 | public uint GetEstateFlags() | 780 | public uint GetEstateFlags() |
781 | { | 781 | { |
782 | Simulator.RegionFlags flags = Simulator.RegionFlags.None; | 782 | RegionFlags flags = RegionFlags.None; |
783 | 783 | ||
784 | if (m_scene.RegionInfo.EstateSettings.FixedSun) | 784 | if (m_scene.RegionInfo.EstateSettings.FixedSun) |
785 | flags |= Simulator.RegionFlags.SunFixed; | 785 | flags |= RegionFlags.SunFixed; |
786 | if (m_scene.RegionInfo.EstateSettings.PublicAccess) | 786 | if (m_scene.RegionInfo.EstateSettings.PublicAccess) |
787 | flags |= (Simulator.RegionFlags.PublicAllowed | | 787 | flags |= (RegionFlags.PublicAllowed | |
788 | Simulator.RegionFlags.ExternallyVisible); | 788 | RegionFlags.ExternallyVisible); |
789 | if (m_scene.RegionInfo.EstateSettings.AllowVoice) | 789 | if (m_scene.RegionInfo.EstateSettings.AllowVoice) |
790 | flags |= Simulator.RegionFlags.AllowVoice; | 790 | flags |= RegionFlags.AllowVoice; |
791 | if (m_scene.RegionInfo.EstateSettings.AllowDirectTeleport) | 791 | if (m_scene.RegionInfo.EstateSettings.AllowDirectTeleport) |
792 | flags |= Simulator.RegionFlags.AllowDirectTeleport; | 792 | flags |= RegionFlags.AllowDirectTeleport; |
793 | if (m_scene.RegionInfo.EstateSettings.DenyAnonymous) | 793 | if (m_scene.RegionInfo.EstateSettings.DenyAnonymous) |
794 | flags |= Simulator.RegionFlags.DenyAnonymous; | 794 | flags |= RegionFlags.DenyAnonymous; |
795 | if (m_scene.RegionInfo.EstateSettings.DenyIdentified) | 795 | if (m_scene.RegionInfo.EstateSettings.DenyIdentified) |
796 | flags |= Simulator.RegionFlags.DenyIdentified; | 796 | flags |= RegionFlags.DenyIdentified; |
797 | if (m_scene.RegionInfo.EstateSettings.DenyTransacted) | 797 | if (m_scene.RegionInfo.EstateSettings.DenyTransacted) |
798 | flags |= Simulator.RegionFlags.DenyTransacted; | 798 | flags |= RegionFlags.DenyTransacted; |
799 | if (m_scene.RegionInfo.EstateSettings.AbuseEmailToEstateOwner) | 799 | if (m_scene.RegionInfo.EstateSettings.AbuseEmailToEstateOwner) |
800 | flags |= Simulator.RegionFlags.AbuseEmailToEstateOwner; | 800 | flags |= RegionFlags.AbuseEmailToEstateOwner; |
801 | if (m_scene.RegionInfo.EstateSettings.BlockDwell) | 801 | if (m_scene.RegionInfo.EstateSettings.BlockDwell) |
802 | flags |= Simulator.RegionFlags.BlockDwell; | 802 | flags |= RegionFlags.BlockDwell; |
803 | if (m_scene.RegionInfo.EstateSettings.EstateSkipScripts) | 803 | if (m_scene.RegionInfo.EstateSettings.EstateSkipScripts) |
804 | flags |= Simulator.RegionFlags.EstateSkipScripts; | 804 | flags |= RegionFlags.EstateSkipScripts; |
805 | if (m_scene.RegionInfo.EstateSettings.ResetHomeOnTeleport) | 805 | if (m_scene.RegionInfo.EstateSettings.ResetHomeOnTeleport) |
806 | flags |= Simulator.RegionFlags.ResetHomeOnTeleport; | 806 | flags |= RegionFlags.ResetHomeOnTeleport; |
807 | if (m_scene.RegionInfo.EstateSettings.TaxFree) | 807 | if (m_scene.RegionInfo.EstateSettings.TaxFree) |
808 | flags |= Simulator.RegionFlags.TaxFree; | 808 | flags |= RegionFlags.TaxFree; |
809 | if (m_scene.RegionInfo.EstateSettings.DenyMinors) | 809 | if (m_scene.RegionInfo.EstateSettings.DenyMinors) |
810 | flags |= (Simulator.RegionFlags)(1 << 30); | 810 | flags |= (RegionFlags)(1 << 30); |
811 | 811 | ||
812 | return (uint)flags; | 812 | return (uint)flags; |
813 | } | 813 | } |