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.dll.build | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'Common/OpenSim.Framework/OpenSim.Framework.dll.build')

diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
index a75388f..a45a121 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -29,9 +29,9 @@
                 <include name="Interfaces/IUserServer.cs" />
                 <include name="Interfaces/IAssetServer.cs" />
                 <include name="Interfaces/IWorld.cs" />
-                <include name="Interfaces/IClientAPI.cs" />
                 <include name="Interfaces/IGridServer.cs" />
                 <include name="Interfaces/ILocalStorage.cs" />
+                <include name="Interfaces/IClientAPI.cs" />
                 <include name="Interfaces/Scripting/IScriptEngine.cs" />
                 <include name="Interfaces/Scripting/IScriptAPI.cs" />
                 <include name="Interfaces/Remoting/IProxyServerHost.cs" />
@@ -46,17 +46,17 @@
                 <include name="Properties/AssemblyInfo.cs" />
                 <include name="Types/NeighbourInfo.cs" />
                 <include name="Types/NetworkServersInfo.cs" />
-                <include name="Types/RegionInfo.cs" />
+                <include name="Types/ParcelData.cs" />
                 <include name="Types/AgentWearable.cs" />
                 <include name="Types/PrimData.cs" />
                 <include name="Types/AssetStorage.cs" />
+                <include name="Types/EstateSettings.cs" />
                 <include name="Types/OSVector3.cs" />
                 <include name="Types/AgentCiruitData.cs" />
                 <include name="Types/Login.cs" />
                 <include name="Types/AssetLandmark.cs" />
                 <include name="Types/AssetBase.cs" />
-                <include name="Types/ParcelData.cs" />
-                <include name="Types/EstateSettings.cs" />
+                <include name="Types/RegionInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
-- 
cgit v1.1