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

diff --git a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
index 810345f..3eed2b8 100644
--- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
+++ b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
@@ -29,6 +29,11 @@ namespace OpenSim.Framework.Interfaces
     public delegate void StatusChange(bool status);

     public delegate void NewAvatar(IClientAPI remoteClient, LLUUID agentID, bool status);

 

+    public delegate void ParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client);

+    public delegate void ParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client);

+    public delegate void ParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client);

+    public delegate void ParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client); // NOTETOSELFremove the packet part

+

     public interface IClientAPI

     {

         event ChatFromViewer OnChatFromViewer;

@@ -81,7 +86,6 @@ namespace OpenSim.Framework.Interfaces
         void SendWearables(AvatarWearable[] wearables);

         void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);

         void SendLayerData(float[] map);

-        void SendRegionHandshake(RegionInfo regionInfo);

         void MoveAgentIntoRegion(RegionInfo regInfo);

         void SendAvatarData(RegionInfo regionInfo, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos);

         void InformClientOfNeighbour(ulong neighbourHandle, System.Net.IPAddress neighbourIP, ushort neighbourPort);

diff --git a/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs b/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs
index 4dd8868..7307966 100644
--- a/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs
+++ b/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs
@@ -37,11 +37,20 @@ namespace OpenSim.Framework.Interfaces
     public interface ILocalStorage

     {

         void Initialise(string datastore);

+

         void StorePrim(PrimData prim);

         void RemovePrim(LLUUID primID);

         void LoadPrimitives(ILocalStorageReceiver receiver);

+

         float[] LoadWorld();

         void SaveMap(float[] heightmap);

+

+        void SaveParcels(ParcelData[] parcels);

+        void SaveParcel(ParcelData parcel);

+        void RemoveParcel(ParcelData parcel);

+        void RemoveAllParcels();

+        void LoadParcels(ILocalStorageParcelReceiver recv);

+

         void ShutDown();

     }

 

@@ -50,5 +59,10 @@ namespace OpenSim.Framework.Interfaces
         void PrimFromStorage(PrimData prim);

     }

 

+    public interface ILocalStorageParcelReceiver

+    {

+        void ParcelFromStorage(ParcelData data);

+        void NoParcelDataFromStorage();

+    }

 }