1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index 5eb7209..64f6768 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -138,32 +138,32 @@ namespace OpenSim.Framework
            switch (key)
            {
            case "region_flags":
-                Simulator.RegionFlags flags = (Simulator.RegionFlags)(uint)value;
+                RegionFlags flags = (RegionFlags)(uint)value;
                m_BlockTerraform =
-                        (flags & Simulator.RegionFlags.BlockTerraform) != 0;
+                        (flags & RegionFlags.BlockTerraform) != 0;
                m_BlockFly =
-                        (flags & Simulator.RegionFlags.NoFly) != 0;
+                        (flags & RegionFlags.NoFly) != 0;
                m_AllowDamage =
-                        (flags & Simulator.RegionFlags.AllowDamage) != 0;
+                        (flags & RegionFlags.AllowDamage) != 0;
                m_RestrictPushing =
-                        (flags & Simulator.RegionFlags.RestrictPushObject) != 0;
+                        (flags & RegionFlags.RestrictPushObject) != 0;
                m_AllowLandResell =
-                        (flags & Simulator.RegionFlags.BlockLandResell) == 0;
+                        (flags & RegionFlags.BlockLandResell) == 0;
                m_AllowLandJoinDivide =
-                        (flags & Simulator.RegionFlags.AllowParcelChanges) != 0;
+                        (flags & RegionFlags.AllowParcelChanges) != 0;
                m_BlockShowInSearch =
                        ((uint)flags & (1 << 29)) != 0;
                m_DisableScripts =
-                        (flags & Simulator.RegionFlags.SkipScripts) != 0;
+                        (flags & RegionFlags.SkipScripts) != 0;
                m_DisableCollisions =
-                        (flags & Simulator.RegionFlags.SkipCollisions) != 0;
+                        (flags & RegionFlags.SkipCollisions) != 0;
                m_DisablePhysics =
-                        (flags & Simulator.RegionFlags.SkipPhysics) != 0;
+                        (flags & RegionFlags.SkipPhysics) != 0;
                m_FixedSun =
-                        (flags & Simulator.RegionFlags.SunFixed) != 0;
+                        (flags & RegionFlags.SunFixed) != 0;
                m_Sandbox =
-                        (flags & Simulator.RegionFlags.Sandbox) != 0;
+                        (flags & RegionFlags.Sandbox) != 0;
                break;
            case "max_agents":
                m_AgentLimit = (int)value;

diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs index 5eb7209..64f6768 100644 --- a/OpenSim/Framework/RegionSettings.cs +++ b/OpenSim/Framework/RegionSettings.cs
@@ -138,32 +138,32 @@ namespace OpenSim.Framework
138	switch (key)	138	switch (key)
139	{	139	{
140	case "region_flags":	140	case "region_flags":
141	Simulator.RegionFlags flags = (Simulator.RegionFlags)(uint)value;	141	RegionFlags flags = (RegionFlags)(uint)value;
142		142
143	m_BlockTerraform =	143	m_BlockTerraform =
144	(flags & Simulator.RegionFlags.BlockTerraform) != 0;	144	(flags & RegionFlags.BlockTerraform) != 0;
145	m_BlockFly =	145	m_BlockFly =
146	(flags & Simulator.RegionFlags.NoFly) != 0;	146	(flags & RegionFlags.NoFly) != 0;
147	m_AllowDamage =	147	m_AllowDamage =
148	(flags & Simulator.RegionFlags.AllowDamage) != 0;	148	(flags & RegionFlags.AllowDamage) != 0;
149	m_RestrictPushing =	149	m_RestrictPushing =
150	(flags & Simulator.RegionFlags.RestrictPushObject) != 0;	150	(flags & RegionFlags.RestrictPushObject) != 0;
151	m_AllowLandResell =	151	m_AllowLandResell =
152	(flags & Simulator.RegionFlags.BlockLandResell) == 0;	152	(flags & RegionFlags.BlockLandResell) == 0;
153	m_AllowLandJoinDivide =	153	m_AllowLandJoinDivide =
154	(flags & Simulator.RegionFlags.AllowParcelChanges) != 0;	154	(flags & RegionFlags.AllowParcelChanges) != 0;
155	m_BlockShowInSearch =	155	m_BlockShowInSearch =
156	((uint)flags & (1 << 29)) != 0;	156	((uint)flags & (1 << 29)) != 0;
157	m_DisableScripts =	157	m_DisableScripts =
158	(flags & Simulator.RegionFlags.SkipScripts) != 0;	158	(flags & RegionFlags.SkipScripts) != 0;
159	m_DisableCollisions =	159	m_DisableCollisions =
160	(flags & Simulator.RegionFlags.SkipCollisions) != 0;	160	(flags & RegionFlags.SkipCollisions) != 0;
161	m_DisablePhysics =	161	m_DisablePhysics =
162	(flags & Simulator.RegionFlags.SkipPhysics) != 0;	162	(flags & RegionFlags.SkipPhysics) != 0;
163	m_FixedSun =	163	m_FixedSun =
164	(flags & Simulator.RegionFlags.SunFixed) != 0;	164	(flags & RegionFlags.SunFixed) != 0;
165	m_Sandbox =	165	m_Sandbox =
166	(flags & Simulator.RegionFlags.Sandbox) != 0;	166	(flags & RegionFlags.Sandbox) != 0;
167	break;	167	break;
168	case "max_agents":	168	case "max_agents":
169	m_AgentLimit = (int)value;	169	m_AgentLimit = (int)value;