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

---
 OpenSim/OpenSim.World/OpenSim.World.csproj | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

(limited to 'OpenSim/OpenSim.World/OpenSim.World.csproj')

diff --git a/OpenSim/OpenSim.World/OpenSim.World.csproj b/OpenSim/OpenSim.World/OpenSim.World.csproj
index dd469a9..f3c7b1f 100644
--- a/OpenSim/OpenSim.World/OpenSim.World.csproj
+++ b/OpenSim/OpenSim.World/OpenSim.World.csproj
@@ -133,49 +133,52 @@
     <Compile Include="Avatar.Client.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Avatar.cs">
+    <Compile Include="Entity.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Avatar.Update.cs">
+    <Compile Include="World.PacketHandlers.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="AvatarAnimations.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Entity.cs">
+    <Compile Include="SceneObject.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Primitive.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="SceneObject.cs">
+    <Compile Include="World.Scripting.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="World.cs">
+    <Compile Include="WorldBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="World.PacketHandlers.cs">
+    <Compile Include="ParcelManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="World.Scripting.cs">
+    <Compile Include="Avatar.Update.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="WorldBase.cs">
+    <Compile Include="World.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="scripting\IScriptContext.cs">
+    <Compile Include="Avatar.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="scripting\IScriptEntity.cs">
+    <Compile Include="scripting\IScriptHandler.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="scripting\IScriptHandler.cs">
+    <Compile Include="scripting\ScriptFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="scripting\IScriptContext.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="scripting\Script.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="scripting\ScriptFactory.cs">
+    <Compile Include="scripting\IScriptEntity.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="scripting\Scripts\FollowRandomAvatar.cs">
@@ -187,6 +190,9 @@
     <Compile Include="types\Triangle.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Estate\EstateManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
-- 
cgit v1.1