*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

1 files changed, 12 insertions, 33 deletions

diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index c984f5a..fc33eb9 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -11,47 +11,26 @@
             <resources prefix="OpenSim.RegionServer" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

-                <include name="AgentAssetUpload.cs" />

-                <include name="AuthenticateSessionsBase.cs" />

+                <include name="NetworkServersInfo.cs" />

+                <include name="UDPServer.cs" />

                 <include name="AuthenticateSessionsLocal.cs" />

                 <include name="AuthenticateSessionsRemote.cs" />

-                <include name="ClientView.cs" />

+                <include name="OpenSimNetworkHandler.cs" />

+                <include name="UserConfigUtility.cs" />

                 <include name="ClientView.Grid.cs" />

                 <include name="ClientView.PacketHandlers.cs" />

                 <include name="ClientView.ProcessPackets.cs" />

+                <include name="VersionInfo.cs" />

+                <include name="AgentAssetUpload.cs" />

                 <include name="ClientViewBase.cs" />

-                <include name="Grid.cs" />

-                <include name="OpenSimMain.cs" />

-                <include name="OpenSimNetworkHandler.cs" />

-                <include name="PacketServer.cs" />

-                <include name="RegionInfo.cs" />

-                <include name="RegionInfoBase.cs" />

                 <include name="RegionServerBase.cs" />

-                <include name="UDPServer.cs" />

-                <include name="VersionInfo.cs" />

-                <include name="Assets/AssetCache.cs" />

-                <include name="Assets/InventoryCache.cs" />

+                <include name="CommsManager.cs" />

+                <include name="ClientView.cs" />

+                <include name="PacketServer.cs" />

+                <include name="ClientView.API.cs" />

                 <include name="CAPS/AdminWebFront.cs" />

-                <include name="types/Mesh.cs" />

-                <include name="types/Triangle.cs" />

-                <include name="world/Avatar.Client.cs" />

-                <include name="world/Avatar.cs" />

-                <include name="world/Avatar.Update.cs" />

-                <include name="world/AvatarAnimations.cs" />

-                <include name="world/Entity.cs" />

-                <include name="world/Primitive.cs" />

-                <include name="world/Primitive2.cs" />

-                <include name="world/SceneObject.cs" />

-                <include name="world/World.cs" />

-                <include name="world/World.PacketHandlers.cs" />

-                <include name="world/World.Scripting.cs" />

-                <include name="world/WorldBase.cs" />

-                <include name="world/scripting/IScriptContext.cs" />

-                <include name="world/scripting/IScriptEntity.cs" />

-                <include name="world/scripting/IScriptHandler.cs" />

-                <include name="world/scripting/Script.cs" />

-                <include name="world/scripting/ScriptFactory.cs" />

-                <include name="world/scripting/Scripts/FollowRandomAvatar.cs" />

+                <include name="Assets/InventoryCache.cs" />

+                <include name="Assets/AssetCache.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

                 <lib>