*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, 30 insertions, 30 deletions

diff --git a/Common/XmlRpcCS/XMLRPC.csproj b/Common/XmlRpcCS/XMLRPC.csproj
index 61f8be0..1ab494e 100644
--- a/Common/XmlRpcCS/XMLRPC.csproj
+++ b/Common/XmlRpcCS/XMLRPC.csproj
@@ -70,58 +70,58 @@
   <ItemGroup>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="Logger.cs">

+    <Compile Include="XmlRpcBoxcarRequest.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="SimpleHttpRequest.cs">

+    <Compile Include="XmlRpcRequest.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcBoxcarRequest.cs">

+    <Compile Include="XmlRpcResponseSerializer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcClientProxy.cs">

+    <Compile Include="Logger.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcDeserializer.cs">

+    <Compile Include="XmlRpcRequestDeserializer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcErrorCodes.cs">

+    <Compile Include="XmlRpcExposedAttribute.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcException.cs">

+    <Compile Include="XmlRpcResponse.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcExposedAttribute.cs">

+    <Compile Include="XmlRpcException.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcRequest.cs">

+    <Compile Include="XmlRpcResponder.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcRequestDeserializer.cs">

+    <Compile Include="XmlRpcResponseDeserializer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcRequestSerializer.cs">

+    <Compile Include="XmlRpcServer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcResponder.cs">

+    <Compile Include="XmlRpcErrorCodes.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcResponse.cs">

+    <Compile Include="XmlRpcSerializer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcResponseDeserializer.cs">

+    <Compile Include="XmlRpcSystemObject.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcResponseSerializer.cs">

+    <Compile Include="SimpleHttpRequest.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcSerializer.cs">

+    <Compile Include="XmlRpcClientProxy.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcServer.cs">

+    <Compile Include="XmlRpcRequestSerializer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="XmlRpcSystemObject.cs">

+    <Compile Include="XmlRpcDeserializer.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="XmlRpcXmlTokens.cs">

diff --git a/Common/XmlRpcCS/XMLRPC.csproj.user b/Common/XmlRpcCS/XMLRPC.csproj.user
index 9bfaf67..082d673 100644
--- a/Common/XmlRpcCS/XMLRPC.csproj.user
+++ b/Common/XmlRpcCS/XMLRPC.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/XmlRpcCS/XMLRPC.dll.build b/Common/XmlRpcCS/XMLRPC.dll.build
index 2eabfcd..e7936c3 100644
--- a/Common/XmlRpcCS/XMLRPC.dll.build
+++ b/Common/XmlRpcCS/XMLRPC.dll.build
@@ -11,24 +11,24 @@
             <resources prefix="XMLRPC" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

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

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

                 <include name="XmlRpcBoxcarRequest.cs" />

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

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

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

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

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

                 <include name="XmlRpcRequest.cs" />

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

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

                 <include name="XmlRpcRequestDeserializer.cs" />

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

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

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

                 <include name="XmlRpcResponse.cs" />

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

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

                 <include name="XmlRpcResponseDeserializer.cs" />

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

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

                 <include name="XmlRpcServer.cs" />

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

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

                 <include name="XmlRpcSystemObject.cs" />

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

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

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

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

                 <include name="XmlRpcXmlTokens.cs" />

             </sources>

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