*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

2 files changed, 9 insertions, 9 deletions

diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
index 39ce0ff..ab29d04 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj
@@ -144,15 +144,15 @@
     <Compile Include="Interfaces\IWorld.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\IClientAPI.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="Interfaces\IGridServer.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Interfaces\ILocalStorage.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="Interfaces\IClientAPI.cs">

+      <SubType>Code</SubType>

+    </Compile>

     <Compile Include="Interfaces\Scripting\IScriptEngine.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -195,7 +195,7 @@
     <Compile Include="Types\NetworkServersInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\RegionInfo.cs">

+    <Compile Include="Types\ParcelData.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Types\AgentWearable.cs">

@@ -207,6 +207,9 @@
     <Compile Include="Types\AssetStorage.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="Types\EstateSettings.cs">

+      <SubType>Code</SubType>

+    </Compile>

     <Compile Include="Types\OSVector3.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -222,10 +225,7 @@
     <Compile Include="Types\AssetBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\ParcelData.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="Types\EstateSettings.cs">

+    <Compile Include="Types\RegionInfo.cs">

       <SubType>Code</SubType>

     </Compile>

   </ItemGroup>

diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj.user b/Common/OpenSim.Framework/OpenSim.Framework.csproj.user
index 9bfaf67..082d673 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj.user
+++ b/Common/OpenSim.Framework/OpenSim.Framework.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>