*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

3 files changed, 11 insertions, 11 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>

diff --git a/Common/OpenSim.Servers/OpenSim.Servers.csproj.user b/Common/OpenSim.Servers/OpenSim.Servers.csproj.user
index 9bfaf67..082d673 100644
--- a/Common/OpenSim.Servers/OpenSim.Servers.csproj.user
+++ b/Common/OpenSim.Servers/OpenSim.Servers.csproj.user
@@ -2,7 +2,7 @@
   <PropertyGroup>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\</ReferencePath>

+    <ReferencePath>C:\sugilite\bin\</ReferencePath>

     <LastOpenVersion>8.0.50727</LastOpenVersion>

     <ProjectView>ProjectFiles</ProjectView>

     <ProjectTrust>0</ProjectTrust>

diff --git a/Common/OpenSim.Servers/OpenSim.Servers.dll.build b/Common/OpenSim.Servers/OpenSim.Servers.dll.build
index 41c1350..a2af584 100644
--- a/Common/OpenSim.Servers/OpenSim.Servers.dll.build
+++ b/Common/OpenSim.Servers/OpenSim.Servers.dll.build
@@ -11,15 +11,15 @@
             <resources prefix="OpenSim.Servers" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

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

                 <include name="BaseHttpServer.cs" />

                 <include name="BaseServer.cs" />

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

                 <include name="IRestHandler.cs" />

                 <include name="LocalUserProfileManager.cs" />

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

                 <include name="LoginResponse.cs" />

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

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

                 <include name="UDPServerBase.cs" />

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

             </sources>

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

                 <lib>