12 files changed, 24 insertions, 25 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

diff --git a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.API.cs b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
index b9773c6..b9773c6 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.API.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
diff --git a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.AgentAssetUpload.cs b/OpenSim/OpenSim.RegionServer/ClientView.AgentAssetUpload.cs
index 31749d8..31749d8 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.AgentAssetUpload.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.AgentAssetUpload.cs
diff --git a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.PacketHandlers.cs b/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
index 035eb4c..035eb4c 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.PacketHandlers.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
diff --git a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.ProcessPackets.cs b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
index c6749a1..c6749a1 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.ProcessPackets.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
diff --git a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.cs b/OpenSim/OpenSim.RegionServer/ClientView.cs
index e9c1f2d..e9c1f2d 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.cs
diff --git a/OpenSim/OpenSim.RegionServer/ClientView/ClientViewBase.cs b/OpenSim/OpenSim.RegionServer/ClientViewBase.cs
index facb3fa..facb3fa 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView/ClientViewBase.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientViewBase.cs
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index c71e60c..5c726bd 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -130,46 +130,46 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="NetworkServersInfo.cs">

+    <Compile Include="ClientView.AgentAssetUpload.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="OpenSimNetworkHandler.cs">

+    <Compile Include="ClientView.API.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="PacketServer.cs">

+    <Compile Include="ClientView.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="RegionServerBase.cs">

+    <Compile Include="ClientView.PacketHandlers.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UDPServer.cs">

+    <Compile Include="ClientView.ProcessPackets.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UserConfigUtility.cs">

+    <Compile Include="ClientViewBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="VersionInfo.cs">

+    <Compile Include="NetworkServersInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Assets\InventoryCache.cs">

+    <Compile Include="OpenSimNetworkHandler.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientView\ClientView.AgentAssetUpload.cs">

+    <Compile Include="PacketServer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientView\ClientView.API.cs">

+    <Compile Include="RegionServerBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientView\ClientView.cs">

+    <Compile Include="UDPServer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientView\ClientView.PacketHandlers.cs">

+    <Compile Include="UserConfigUtility.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientView\ClientView.ProcessPackets.cs">

+    <Compile Include="VersionInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientView\ClientViewBase.cs">

+    <Compile Include="Assets\InventoryCache.cs">

       <SubType>Code</SubType>

     </Compile>

   </ItemGroup>

diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 10e3422..87c5b22 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -11,6 +11,12 @@
             <resources prefix="OpenSim.RegionServer" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

+                <include name="ClientView.AgentAssetUpload.cs" />

+                <include name="ClientView.API.cs" />

+                <include name="ClientView.cs" />

+                <include name="ClientView.PacketHandlers.cs" />

+                <include name="ClientView.ProcessPackets.cs" />

+                <include name="ClientViewBase.cs" />

                 <include name="NetworkServersInfo.cs" />

                 <include name="OpenSimNetworkHandler.cs" />

                 <include name="PacketServer.cs" />

@@ -19,12 +25,6 @@
                 <include name="UserConfigUtility.cs" />

                 <include name="VersionInfo.cs" />

                 <include name="Assets/InventoryCache.cs" />

-                <include name="ClientView/ClientView.AgentAssetUpload.cs" />

-                <include name="ClientView/ClientView.API.cs" />

-                <include name="ClientView/ClientView.cs" />

-                <include name="ClientView/ClientView.PacketHandlers.cs" />

-                <include name="ClientView/ClientView.ProcessPackets.cs" />

-                <include name="ClientView/ClientViewBase.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

                 <lib>