*Merged EstateManager, EstateSettings, ParcelManager,Parcel, and ParcelData classes

*Incorporated EstateSettings into the RegionInfo class
*Next step is to load from db, save to db the parcel and estate settings

1 files changed, 7 insertions, 7 deletions

diff --git a/Common/OpenSim.Servers/OpenSim.Servers.csproj b/Common/OpenSim.Servers/OpenSim.Servers.csproj
index e89a62c..6768ce4 100644
--- a/Common/OpenSim.Servers/OpenSim.Servers.csproj
+++ b/Common/OpenSim.Servers/OpenSim.Servers.csproj
@@ -92,13 +92,13 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="BaseHttpServer.cs">

+    <Compile Include="LoginServer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="BaseServer.cs">

+    <Compile Include="BaseHttpServer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="CheckSumServer.cs">

+    <Compile Include="BaseServer.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="IRestHandler.cs">

@@ -107,16 +107,16 @@
     <Compile Include="LocalUserProfileManager.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="LoginResponse.cs">

+    <Compile Include="XmlRpcMethod.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="LoginServer.cs">

+    <Compile Include="LoginResponse.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UDPServerBase.cs">

+    <Compile Include="CheckSumServer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcMethod.cs">

+    <Compile Include="UDPServerBase.cs">

       <SubType>Code</SubType>

     </Compile>

   </ItemGroup>