4 files changed, 4 insertions, 5 deletions

diff --git a/OpenSim/OpenSim.Region/Estate/EstateManager.cs b/OpenSim/OpenSim.Region/EstateManager.cs
index 875defd..88b2dac 100644
--- a/OpenSim/OpenSim.Region/Estate/EstateManager.cs
+++ b/OpenSim/OpenSim.Region/EstateManager.cs
@@ -37,7 +37,7 @@ using OpenSim;
 using libsecondlife;

 using libsecondlife.Packets;

 

-namespace OpenSim.Region.Estate

+namespace OpenSim.Region

 {

 

     /// <summary>

diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.csproj b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
index ff916d1..03c7c7d 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.csproj
+++ b/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">

diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
index a49c08f..6ddf462 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
+++ b/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" />

diff --git a/OpenSim/OpenSim.Region/Scene/Scene.cs b/OpenSim/OpenSim.Region/Scene/Scene.cs
index e3ffca4..6b27f8f 100644
--- a/OpenSim/OpenSim.Region/Scene/Scene.cs
+++ b/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