*Fixed up EstateManagementModule to the module standard - no more packets allowed!

*Started cleaning up the land module

2 files changed, 49 insertions, 3 deletions

diff --git a/OpenSim/Framework/Constants.cs b/OpenSim/Framework/Constants.cs
index 395b71d..7a7d5d3 100644
--- a/OpenSim/Framework/Constants.cs
+++ b/OpenSim/Framework/Constants.cs
@@ -31,5 +31,13 @@ namespace OpenSim.Framework
     {
         public const uint RegionSize = 256;
         public const byte TerrainPatchSize = 16;
+
+        public enum EstateAccessCodex : uint
+        {
+            AccessOptions = 17,
+            AllowedGroups = 18,
+            EstateBans = 20,
+            EstateManagers = 24
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 02dfc8c..b413c2c3 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -355,9 +355,9 @@ namespace OpenSim.Framework
 
     public delegate void EstateOwnerMessageRequest(EstateOwnerMessagePacket packet, IClientAPI remote_client);
 
-    public delegate void RegionInfoRequest(IClientAPI remote_client, LLUUID sessionID);
+    public delegate void RegionInfoRequest(IClientAPI remote_client);
 
-    public delegate void EstateCovenantRequest(IClientAPI remote_client, LLUUID sessionID);
+    public delegate void EstateCovenantRequest(IClientAPI remote_client);
 
     public delegate void UUIDNameRequest(LLUUID id, IClientAPI remote_client);
 
@@ -456,6 +456,22 @@ namespace OpenSim.Framework
     public delegate void ScriptAnswer(IClientAPI remoteClient, LLUUID objectID, LLUUID itemID, int answer);
 
     public delegate void RequestPayPrice(IClientAPI remoteClient, LLUUID objectID);
+    
+    //Estate Requests
+    public delegate void DetailedEstateDataRequest(IClientAPI remoteClient, LLUUID invoice);
+    public delegate void SetEstateFlagsRequest(bool blockTerraform, bool noFly, bool allowDamage, bool blockLandResell, int maxAgents, float objectBonusFactor, int matureLevel, bool restrictPushObject, bool allowParcelChanges);
+    public delegate void SetEstateTerrainBaseTexture(IClientAPI remoteClient, int corner, LLUUID side);
+    public delegate void SetEstateTerrainDetailTexture(IClientAPI remoteClient, int corner, LLUUID side);
+    public delegate void SetEstateTerrainTextureHeights(IClientAPI remoteClient, int corner, float lowVal, float highVal);
+    public delegate void CommitEstateTerrainTextureRequest(IClientAPI remoteClient);
+    public delegate void SetRegionTerrainSettings(float waterHeight, float terrainRaiseLimit, float terrainLowerLimit, bool fixedSun, float sunHour);
+    public delegate void EstateRestartSimRequest(IClientAPI remoteClient, int secondsTilReboot);
+    public delegate void EstateChangeCovenantRequest(IClientAPI remoteClient, LLUUID newCovenantID);
+    public delegate void UpdateEstateAccessDeltaRequest(IClientAPI remote_client, LLUUID invoice, int estateAccessType, LLUUID user);
+    public delegate void SimulatorBlueBoxMessageRequest(IClientAPI remoteClient, LLUUID invoice, LLUUID senderID, LLUUID sessionID, string senderName, string message);
+    public delegate void EstateBlueBoxMessageRequest(IClientAPI remoteClient, LLUUID invoice, LLUUID senderID, LLUUID sessionID, string senderName, string message);
+    public delegate void EstateDebugRegionRequest(IClientAPI remoteClient, LLUUID invoice, LLUUID senderID, bool scripted, bool collisionEvents, bool physics);
+    public delegate void EstateTeleportOneUserHomeRequest(IClientAPI remoteClient, LLUUID invoice, LLUUID senderID, LLUUID prey);
 
     public interface IClientAPI
     {
@@ -587,7 +603,6 @@ namespace OpenSim.Framework
         event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;
         event ParcelSelectObjects OnParcelSelectObjects;
         event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest;
-        event EstateOwnerMessageRequest OnEstateOwnerMessage;
         event RegionInfoRequest OnRegionInfoRequest;
         event EstateCovenantRequest OnEstateCovenantRequest;
 
@@ -613,6 +628,24 @@ namespace OpenSim.Framework
 
         event AgentSit OnUndo;
 
+        event DetailedEstateDataRequest OnDetailedEstateDataRequest;
+        event SetEstateFlagsRequest OnSetEstateFlagsRequest;
+        event SetEstateTerrainBaseTexture OnSetEstateTerrainBaseTexture;
+        event SetEstateTerrainDetailTexture OnSetEstateTerrainDetailTexture;
+        event SetEstateTerrainTextureHeights OnSetEstateTerrainTextureHeights;
+        event CommitEstateTerrainTextureRequest OnCommitEstateTerrainTextureRequest;
+        event SetRegionTerrainSettings OnSetRegionTerrainSettings;
+        event EstateRestartSimRequest OnEstateRestartSimRequest;
+        event EstateChangeCovenantRequest OnEstateChangeCovenantRequest;
+        event UpdateEstateAccessDeltaRequest OnUpdateEstateAccessDeltaRequest;
+        event SimulatorBlueBoxMessageRequest  OnSimulatorBlueBoxMessageRequest;
+        event EstateBlueBoxMessageRequest OnEstateBlueBoxMessageRequest;
+        event EstateDebugRegionRequest OnEstateDebugRegionRequest;
+        event EstateTeleportOneUserHomeRequest OnEstateTeleportOneUserHomeRequest;
+
+
+        
+
         void OutPacket(Packet newPack, ThrottleOutPacketType packType);
         void SendWearables(AvatarWearable[] wearables, int serial);
         void SendAppearance(LLUUID agentID, byte[] visualParams, byte[] textureEntry);
@@ -731,6 +764,11 @@ namespace OpenSim.Framework
         void SendScriptQuestion(LLUUID taskID, string taskName, string ownerName, LLUUID itemID, int question);
         void SendHealth(float health);
 
+
+        void sendEstateManagersList(LLUUID invoice);
+        void sendRegionInfoToEstateMenu();
+        void sendEstateCovenantInformation();
+
         byte[] GetThrottlesPacked(float multiplier);