From 2239ecba188b0435d9a6d58b1c66f2b6eb591116 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Fri, 8 Jun 2007 19:10:55 +0000
Subject: *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

---
 Common/OpenSim.Framework/OpenSim.Framework.csproj | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'Common/OpenSim.Framework/OpenSim.Framework.csproj')

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>
-- 
cgit v1.1