OpenSim/OpenSim.Region/EstateManager.cs

@@ -37,7 +37,7 @@ using OpenSim;
 using libsecondlife;
 using libsecondlife.Packets;
 
-namespace OpenSim.Region.Estate
+namespace OpenSim.Region
 {
 
     /// <summary>

OpenSim/OpenSim.Region/OpenSim.Region.csproj

@@ -130,10 +130,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ParcelManager.cs">
+    <Compile Include="EstateManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Estate\EstateManager.cs">
+    <Compile Include="ParcelManager.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Scene\Scene.cs">

OpenSim/OpenSim.Region/OpenSim.Region.dll.build

@@ -11,8 +11,8 @@
             <resources prefix="OpenSim.Region" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
+                <include name="EstateManager.cs" />
                 <include name="ParcelManager.cs" />
-                <include name="Estate/EstateManager.cs" />
                 <include name="Scene/Scene.cs" />
                 <include name="Scene/Scene.PacketHandlers.cs" />
                 <include name="Scene/Scene.Scripting.cs" />

OpenSim/OpenSim.Region/Scene/Scene.cs

@@ -42,7 +42,6 @@ using OpenSim.Framework;
 using OpenSim.Region.Scripting;
 using OpenSim.Terrain;
 using OpenGrid.Framework.Communications;
-using OpenSim.Region.Estate;
 
 
 namespace OpenSim.Region