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

diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 990b5c3..fa91d7d 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -124,7 +124,10 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="AgentAssetUpload.cs">

+    <Compile Include="NetworkServersInfo.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="UDPServer.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="AuthenticateSessionsLocal.cs">

@@ -133,10 +136,10 @@
     <Compile Include="AuthenticateSessionsRemote.cs">

       <SubType>Code</SubType>

     </Compile>

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

+    <Compile Include="OpenSimNetworkHandler.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientView.cs">

+    <Compile Include="UserConfigUtility.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="ClientView.Grid.cs">

@@ -148,40 +151,37 @@
     <Compile Include="ClientView.ProcessPackets.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientViewBase.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="CommsManager.cs">

+    <Compile Include="VersionInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="NetworkServersInfo.cs">

+    <Compile Include="AgentAssetUpload.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="OpenSimNetworkHandler.cs">

+    <Compile Include="ClientViewBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="PacketServer.cs">

+    <Compile Include="RegionServerBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="RegionServerBase.cs">

+    <Compile Include="CommsManager.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UDPServer.cs">

+    <Compile Include="ClientView.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UserConfigUtility.cs">

+    <Compile Include="PacketServer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="VersionInfo.cs">

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

       <SubType>Code</SubType>

     </Compile>

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

+    <Compile Include="CAPS\AdminWebFront.cs">

       <SubType>Code</SubType>

     </Compile>

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

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="CAPS\AdminWebFront.cs">

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

       <SubType>Code</SubType>

     </Compile>

   </ItemGroup>

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