aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Constants.cs8
-rw-r--r--OpenSim/Framework/IClientAPI.cs44
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
31 { 31 {
32 public const uint RegionSize = 256; 32 public const uint RegionSize = 256;
33 public const byte TerrainPatchSize = 16; 33 public const byte TerrainPatchSize = 16;
34
35 public enum EstateAccessCodex : uint
36 {
37 AccessOptions = 17,
38 AllowedGroups = 18,
39 EstateBans = 20,
40 EstateManagers = 24
41 }
34 } 42 }
35} \ No newline at end of file 43} \ 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
355 355
356 public delegate void EstateOwnerMessageRequest(EstateOwnerMessagePacket packet, IClientAPI remote_client); 356 public delegate void EstateOwnerMessageRequest(EstateOwnerMessagePacket packet, IClientAPI remote_client);
357 357
358 public delegate void RegionInfoRequest(IClientAPI remote_client, LLUUID sessionID); 358 public delegate void RegionInfoRequest(IClientAPI remote_client);
359 359
360 public delegate void EstateCovenantRequest(IClientAPI remote_client, LLUUID sessionID); 360 public delegate void EstateCovenantRequest(IClientAPI remote_client);
361 361
362 public delegate void UUIDNameRequest(LLUUID id, IClientAPI remote_client); 362 public delegate void UUIDNameRequest(LLUUID id, IClientAPI remote_client);
363 363
@@ -456,6 +456,22 @@ namespace OpenSim.Framework
456 public delegate void ScriptAnswer(IClientAPI remoteClient, LLUUID objectID, LLUUID itemID, int answer); 456 public delegate void ScriptAnswer(IClientAPI remoteClient, LLUUID objectID, LLUUID itemID, int answer);
457 457
458 public delegate void RequestPayPrice(IClientAPI remoteClient, LLUUID objectID); 458 public delegate void RequestPayPrice(IClientAPI remoteClient, LLUUID objectID);
459
460 //Estate Requests
461 public delegate void DetailedEstateDataRequest(IClientAPI remoteClient, LLUUID invoice);
462 public delegate void SetEstateFlagsRequest(bool blockTerraform, bool noFly, bool allowDamage, bool blockLandResell, int maxAgents, float objectBonusFactor, int matureLevel, bool restrictPushObject, bool allowParcelChanges);
463 public delegate void SetEstateTerrainBaseTexture(IClientAPI remoteClient, int corner, LLUUID side);
464 public delegate void SetEstateTerrainDetailTexture(IClientAPI remoteClient, int corner, LLUUID side);
465 public delegate void SetEstateTerrainTextureHeights(IClientAPI remoteClient, int corner, float lowVal, float highVal);
466 public delegate void CommitEstateTerrainTextureRequest(IClientAPI remoteClient);
467 public delegate void SetRegionTerrainSettings(float waterHeight, float terrainRaiseLimit, float terrainLowerLimit, bool fixedSun, float sunHour);
468 public delegate void EstateRestartSimRequest(IClientAPI remoteClient, int secondsTilReboot);
469 public delegate void EstateChangeCovenantRequest(IClientAPI remoteClient, LLUUID newCovenantID);
470 public delegate void UpdateEstateAccessDeltaRequest(IClientAPI remote_client, LLUUID invoice, int estateAccessType, LLUUID user);
471 public delegate void SimulatorBlueBoxMessageRequest(IClientAPI remoteClient, LLUUID invoice, LLUUID senderID, LLUUID sessionID, string senderName, string message);
472 public delegate void EstateBlueBoxMessageRequest(IClientAPI remoteClient, LLUUID invoice, LLUUID senderID, LLUUID sessionID, string senderName, string message);
473 public delegate void EstateDebugRegionRequest(IClientAPI remoteClient, LLUUID invoice, LLUUID senderID, bool scripted, bool collisionEvents, bool physics);
474 public delegate void EstateTeleportOneUserHomeRequest(IClientAPI remoteClient, LLUUID invoice, LLUUID senderID, LLUUID prey);
459 475
460 public interface IClientAPI 476 public interface IClientAPI
461 { 477 {
@@ -587,7 +603,6 @@ namespace OpenSim.Framework
587 event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest; 603 event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;
588 event ParcelSelectObjects OnParcelSelectObjects; 604 event ParcelSelectObjects OnParcelSelectObjects;
589 event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest; 605 event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest;
590 event EstateOwnerMessageRequest OnEstateOwnerMessage;
591 event RegionInfoRequest OnRegionInfoRequest; 606 event RegionInfoRequest OnRegionInfoRequest;
592 event EstateCovenantRequest OnEstateCovenantRequest; 607 event EstateCovenantRequest OnEstateCovenantRequest;
593 608
@@ -613,6 +628,24 @@ namespace OpenSim.Framework
613 628
614 event AgentSit OnUndo; 629 event AgentSit OnUndo;
615 630
631 event DetailedEstateDataRequest OnDetailedEstateDataRequest;
632 event SetEstateFlagsRequest OnSetEstateFlagsRequest;
633 event SetEstateTerrainBaseTexture OnSetEstateTerrainBaseTexture;
634 event SetEstateTerrainDetailTexture OnSetEstateTerrainDetailTexture;
635 event SetEstateTerrainTextureHeights OnSetEstateTerrainTextureHeights;
636 event CommitEstateTerrainTextureRequest OnCommitEstateTerrainTextureRequest;
637 event SetRegionTerrainSettings OnSetRegionTerrainSettings;
638 event EstateRestartSimRequest OnEstateRestartSimRequest;
639 event EstateChangeCovenantRequest OnEstateChangeCovenantRequest;
640 event UpdateEstateAccessDeltaRequest OnUpdateEstateAccessDeltaRequest;
641 event SimulatorBlueBoxMessageRequest OnSimulatorBlueBoxMessageRequest;
642 event EstateBlueBoxMessageRequest OnEstateBlueBoxMessageRequest;
643 event EstateDebugRegionRequest OnEstateDebugRegionRequest;
644 event EstateTeleportOneUserHomeRequest OnEstateTeleportOneUserHomeRequest;
645
646
647
648
616 void OutPacket(Packet newPack, ThrottleOutPacketType packType); 649 void OutPacket(Packet newPack, ThrottleOutPacketType packType);
617 void SendWearables(AvatarWearable[] wearables, int serial); 650 void SendWearables(AvatarWearable[] wearables, int serial);
618 void SendAppearance(LLUUID agentID, byte[] visualParams, byte[] textureEntry); 651 void SendAppearance(LLUUID agentID, byte[] visualParams, byte[] textureEntry);
@@ -731,6 +764,11 @@ namespace OpenSim.Framework
731 void SendScriptQuestion(LLUUID taskID, string taskName, string ownerName, LLUUID itemID, int question); 764 void SendScriptQuestion(LLUUID taskID, string taskName, string ownerName, LLUUID itemID, int question);
732 void SendHealth(float health); 765 void SendHealth(float health);
733 766
767
768 void sendEstateManagersList(LLUUID invoice);
769 void sendRegionInfoToEstateMenu();
770 void sendEstateCovenantInformation();
771
734 byte[] GetThrottlesPacked(float multiplier); 772 byte[] GetThrottlesPacked(float multiplier);
735 773
736 774