From 996176b125991b802b183470e40fcf093b2bad6b Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 8 Aug 2020 19:47:08 +0100 Subject: [PATCH] a few more 'events' --- .../Region/Framework/Scenes/EventManager.cs | 287 ++++++++---------- 1 file changed, 121 insertions(+), 166 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index dcd6b29f55..d3b419b3c3 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs @@ -46,7 +46,6 @@ namespace OpenSim.Region.Framework.Scenes private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); public delegate void OnFrameDelegate(); - /// /// Triggered on each sim frame. /// @@ -55,10 +54,9 @@ namespace OpenSim.Region.Framework.Scenes /// Core uses it for things like Sun, Wind & Clouds /// The MRM module also uses it. /// - public event OnFrameDelegate OnFrame; + public OnFrameDelegate OnFrame; public delegate void ClientMovement(ScenePresence client); - /// /// Trigerred when an agent moves. /// @@ -66,10 +64,9 @@ namespace OpenSim.Region.Framework.Scenes /// This gets triggered in /// prior to /// - public event ClientMovement OnClientMovement; + public ClientMovement OnClientMovement; public delegate void OnTerrainTaintedDelegate(); - /// /// Triggered if the terrain has been edited /// @@ -77,11 +74,9 @@ namespace OpenSim.Region.Framework.Scenes /// This gets triggered in /// after it determines that an update has been made. /// - public event OnTerrainTaintedDelegate OnTerrainTainted; + public OnTerrainTaintedDelegate OnTerrainTainted; public delegate void OnTerrainTickDelegate(); - public delegate void OnTerrainCheckUpdatesDelegate(); - /// /// Triggered if the terrain has been edited /// @@ -89,15 +84,15 @@ namespace OpenSim.Region.Framework.Scenes /// This gets triggered in /// but is used by core solely to update the physics engine. /// - public event OnTerrainTickDelegate OnTerrainTick; - public event OnTerrainCheckUpdatesDelegate OnTerrainCheckUpdates; + public OnTerrainTickDelegate OnTerrainTick; + + public delegate void OnTerrainCheckUpdatesDelegate(); + public OnTerrainCheckUpdatesDelegate OnTerrainCheckUpdates; public delegate void OnTerrainUpdateDelegate(); - - public event OnTerrainUpdateDelegate OnTerrainUpdate; + public OnTerrainUpdateDelegate OnTerrainUpdate; public delegate void OnBackupDelegate(ISimulationDataService datastore, bool forceBackup); - /// /// Triggered when a region is backed up/persisted to storage /// @@ -105,10 +100,9 @@ namespace OpenSim.Region.Framework.Scenes /// This gets triggered in /// and is fired before the persistence occurs. /// - public event OnBackupDelegate OnBackup; + public OnBackupDelegate OnBackup; public delegate void OnClientConnectCoreDelegate(IClientCore client); - /// /// Triggered when a new client connects to the scene. /// @@ -118,10 +112,9 @@ namespace OpenSim.Region.Framework.Scenes /// also implements and as such, /// is not triggered by NPCs. /// - public event OnClientConnectCoreDelegate OnClientConnect; + public OnClientConnectCoreDelegate OnClientConnect; public delegate void OnNewClientDelegate(IClientAPI client); - /// /// Triggered when a new client is added to the scene. /// @@ -133,7 +126,7 @@ namespace OpenSim.Region.Framework.Scenes /// This is triggered under per-agent lock. So if you want to perform any long-running operations, please /// do this on a separate thread. /// - public event OnNewClientDelegate OnNewClient; + public OnNewClientDelegate OnNewClient; /// /// Fired if the client entering this sim is doing so as a new login @@ -142,10 +135,9 @@ namespace OpenSim.Region.Framework.Scenes /// This is triggered under per-agent lock. So if you want to perform any long-running operations, please /// do this on a separate thread. /// - public event Action OnClientLogin; + public Action OnClientLogin; public delegate void OnNewPresenceDelegate(ScenePresence presence); - /// /// Triggered when a new presence is added to the scene /// @@ -153,10 +145,9 @@ namespace OpenSim.Region.Framework.Scenes /// Triggered in which is used by both /// users and NPCs /// - public event OnNewPresenceDelegate OnNewPresence; + public OnNewPresenceDelegate OnNewPresence; public delegate void OnRemovePresenceDelegate(UUID agentId); - /// /// Triggered when a presence is removed from the scene /// @@ -167,10 +158,9 @@ namespace OpenSim.Region.Framework.Scenes /// Triggered under per-agent lock. So if you want to perform any long-running operations, please /// do this on a separate thread. /// - public event OnRemovePresenceDelegate OnRemovePresence; + public OnRemovePresenceDelegate OnRemovePresence; public delegate void OnParcelPrimCountUpdateDelegate(); - /// /// Triggered whenever the prim count may have been altered, or prior /// to an action that requires the current prim count to be accurate. @@ -185,10 +175,9 @@ namespace OpenSim.Region.Framework.Scenes /// , /// /// - public event OnParcelPrimCountUpdateDelegate OnParcelPrimCountUpdate; + public OnParcelPrimCountUpdateDelegate OnParcelPrimCountUpdate; public delegate void OnParcelPrimCountAddDelegate(SceneObjectGroup obj); - /// /// Triggered in response to for /// objects that actually contribute to parcel prim count. @@ -197,10 +186,9 @@ namespace OpenSim.Region.Framework.Scenes /// Triggered by in /// /// - public event OnParcelPrimCountAddDelegate OnParcelPrimCountAdd; + public OnParcelPrimCountAddDelegate OnParcelPrimCountAdd; public delegate void OnPluginConsoleDelegate(string[] args); - /// /// Triggered after /// has been called for all @@ -217,20 +205,14 @@ namespace OpenSim.Region.Framework.Scenes /// via /// /// - public event OnPluginConsoleDelegate OnPluginConsole; + public OnPluginConsoleDelegate OnPluginConsole; /// /// Triggered when the entire simulator is shutdown. /// - public event Action OnShutdown; - - public delegate void ObjectDeGrabDelegate(uint localID, uint originalID, IClientAPI remoteClient, SurfaceTouchEventArgs surfaceArgs); - public delegate void ScriptResetDelegate(uint localID, UUID itemID); - - public delegate void OnPermissionErrorDelegate(UUID user, string reason); + public Action OnShutdown; public delegate void OnSetRootAgentSceneDelegate(UUID agentID, Scene scene); - /// /// Triggered before the grunt work for adding a root agent to a /// scene has been performed (resuming attachment scripts, physics, @@ -243,7 +225,7 @@ namespace OpenSim.Region.Framework.Scenes /// via /// and /// - public event OnSetRootAgentSceneDelegate OnSetRootAgentScene; + public OnSetRootAgentSceneDelegate OnSetRootAgentScene; /// /// Triggered after parcel properties have been updated. @@ -253,7 +235,7 @@ namespace OpenSim.Region.Framework.Scenes /// , /// /// - public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest; + public ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest; /// /// Triggered when an individual scene is shutdown. @@ -262,8 +244,9 @@ namespace OpenSim.Region.Framework.Scenes /// This does not automatically mean that the entire simulator is shutting down. Listen to OnShutdown for that /// notification. /// - public event Action OnSceneShuttingDown; + public Action OnSceneShuttingDown; + public delegate void ObjectGrabDelegate(uint localID, uint originalID, Vector3 offsetPos, IClientAPI remoteClient, SurfaceTouchEventArgs surfaceArgs); /// /// Fired when an object is touched/grabbed. /// @@ -274,8 +257,7 @@ namespace OpenSim.Region.Framework.Scenes /// via /// in /// - public event ObjectGrabDelegate OnObjectGrab; - public delegate void ObjectGrabDelegate(uint localID, uint originalID, Vector3 offsetPos, IClientAPI remoteClient, SurfaceTouchEventArgs surfaceArgs); + public ObjectGrabDelegate OnObjectGrab; /// /// Triggered when an object is being touched/grabbed continuously. @@ -285,8 +267,9 @@ namespace OpenSim.Region.Framework.Scenes /// via /// in /// - public event ObjectGrabDelegate OnObjectGrabbing; + public ObjectGrabDelegate OnObjectGrabbing; + public delegate void ObjectDeGrabDelegate(uint localID, uint originalID, IClientAPI remoteClient, SurfaceTouchEventArgs surfaceArgs); /// /// Triggered when an object stops being touched/grabbed. /// @@ -295,8 +278,9 @@ namespace OpenSim.Region.Framework.Scenes /// via /// in /// - public event ObjectDeGrabDelegate OnObjectDeGrab; + public ObjectDeGrabDelegate OnObjectDeGrab; + public delegate void ScriptResetDelegate(uint localID, UUID itemID); /// /// Triggered when a script resets. /// @@ -306,10 +290,12 @@ namespace OpenSim.Region.Framework.Scenes /// via /// via /// - public event ScriptResetDelegate OnScriptReset; + public ScriptResetDelegate OnScriptReset; - public event OnPermissionErrorDelegate OnPermissionError; + public delegate void OnPermissionErrorDelegate(UUID user, string reason); + public OnPermissionErrorDelegate OnPermissionError; + public delegate void NewRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez, string engine, int stateSource); /// /// Fired when a script is run. /// @@ -318,11 +304,10 @@ namespace OpenSim.Region.Framework.Scenes /// Triggered by /// in /// - public event NewRezScript OnRezScript; - public delegate void NewRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez, string engine, int stateSource); + public NewRezScript OnRezScript; + public delegate void RemoveScript(uint localID, UUID itemID); - /// /// Triggered when a script is removed from an object. /// @@ -333,10 +318,10 @@ namespace OpenSim.Region.Framework.Scenes /// , /// /// - public event RemoveScript OnRemoveScript; + public RemoveScript OnRemoveScript; + public delegate void StartScript(uint localID, UUID itemID); - /// /// Triggered when a script starts. /// @@ -346,10 +331,9 @@ namespace OpenSim.Region.Framework.Scenes /// via , /// via /// - public event StartScript OnStartScript; + public StartScript OnStartScript; public delegate void StopScript(uint localID, UUID itemID); - /// /// Triggered when a script stops. /// @@ -359,10 +343,9 @@ namespace OpenSim.Region.Framework.Scenes /// , /// /// - public event StopScript OnStopScript; + public StopScript OnStopScript; public delegate bool SceneGroupMoved(UUID groupID, Vector3 delta); - /// /// Triggered when an object is moved. /// @@ -371,10 +354,9 @@ namespace OpenSim.Region.Framework.Scenes /// in , /// /// - public event SceneGroupMoved OnSceneGroupMove; + public SceneGroupMoved OnSceneGroupMove; public delegate void SceneGroupGrabed(UUID groupID, Vector3 offset, UUID userID); - /// /// Triggered when an object is grabbed. /// @@ -386,10 +368,9 @@ namespace OpenSim.Region.Framework.Scenes /// via /// via /// - public event SceneGroupGrabed OnSceneGroupGrab; + public SceneGroupGrabed OnSceneGroupGrab; public delegate bool SceneGroupSpinStarted(UUID groupID); - /// /// Triggered when an object starts to spin. /// @@ -400,10 +381,9 @@ namespace OpenSim.Region.Framework.Scenes /// via /// via /// - public event SceneGroupSpinStarted OnSceneGroupSpinStart; + public SceneGroupSpinStarted OnSceneGroupSpinStart; public delegate bool SceneGroupSpun(UUID groupID, Quaternion rotation); - /// /// Triggered when an object is being spun. /// @@ -414,29 +394,29 @@ namespace OpenSim.Region.Framework.Scenes /// via /// via /// - public event SceneGroupSpun OnSceneGroupSpin; + public SceneGroupSpun OnSceneGroupSpin; public delegate void LandObjectAdded(ILandObject newParcel); - public event LandObjectAdded OnLandObjectAdded; + public LandObjectAdded OnLandObjectAdded; public delegate void LandObjectRemoved(UUID globalID); - public event LandObjectRemoved OnLandObjectRemoved; + public LandObjectRemoved OnLandObjectRemoved; public delegate void AvatarEnteringNewParcel(ScenePresence avatar, int localLandID, UUID regionID); - public event AvatarEnteringNewParcel OnAvatarEnteringNewParcel; + public AvatarEnteringNewParcel OnAvatarEnteringNewParcel; public delegate void AvatarAppearanceChange(ScenePresence avatar); - public event AvatarAppearanceChange OnAvatarAppearanceChange; + public AvatarAppearanceChange OnAvatarAppearanceChange; - public event Action OnSignificantClientMovement; + public Action OnSignificantClientMovement; public delegate void IncomingInstantMessage(GridInstantMessage message); - public event IncomingInstantMessage OnIncomingInstantMessage; + public IncomingInstantMessage OnIncomingInstantMessage; public delegate void CrossAgentToNewRegion(ScenePresence sp, bool isFlying, GridRegion newRegion); - public event CrossAgentToNewRegion OnCrossAgentToNewRegion; + public CrossAgentToNewRegion OnCrossAgentToNewRegion; - public event IncomingInstantMessage OnUnhandledInstantMessage; + public IncomingInstantMessage OnUnhandledInstantMessage; public delegate void ClientClosed(UUID clientID, Scene scene); @@ -449,10 +429,9 @@ namespace OpenSim.Region.Framework.Scenes /// This is triggered under per-agent lock. So if you want to perform any long-running operations, please /// do this on a separate thread. /// - public event ClientClosed OnClientClosed; + public ClientClosed OnClientClosed; public delegate void NewScript(UUID clientID, SceneObjectPart part, UUID itemID); - /// /// Fired when a script is created. /// @@ -462,10 +441,10 @@ namespace OpenSim.Region.Framework.Scenes /// in , /// /// - public event NewScript OnNewScript; + public NewScript OnNewScript; public delegate void ExtraSettingChangedDelegate(Scene scene, string name, string value); - public event ExtraSettingChangedDelegate OnExtraSettingChanged; + public ExtraSettingChangedDelegate OnExtraSettingChanged; public virtual void TriggerNewScript(UUID clientID, SceneObjectPart part, UUID itemID) { @@ -489,7 +468,6 @@ namespace OpenSim.Region.Framework.Scenes } public delegate void UpdateScript(UUID clientID, UUID itemId, UUID primId, bool isScriptRunning, UUID newAssetID); - /// /// An indication that the script has changed. /// @@ -502,7 +480,7 @@ namespace OpenSim.Region.Framework.Scenes /// via /// via /// - public event UpdateScript OnUpdateScript; + public UpdateScript OnUpdateScript; public virtual void TriggerUpdateScript(UUID clientId, UUID itemId, UUID primId, bool isScriptRunning, UUID newAssetID) { @@ -538,7 +516,7 @@ namespace OpenSim.Region.Framework.Scenes /// in , /// /// - public event ScriptChangedEvent OnScriptChangedEvent; + public ScriptChangedEvent OnScriptChangedEvent; public delegate void ScriptChangedEvent(uint localID, uint change, object data); public delegate void ScriptControlEvent(UUID item, UUID avatarID, uint held, uint changed); @@ -553,21 +531,21 @@ namespace OpenSim.Region.Framework.Scenes /// via /// via /// - public event ScriptControlEvent OnScriptControlEvent; + public ScriptControlEvent OnScriptControlEvent; public delegate void ScriptMovingStartEvent(uint localID); /// /// TODO: Should be triggered when a physics object starts moving. /// - public event ScriptMovingStartEvent OnScriptMovingStartEvent; + public ScriptMovingStartEvent OnScriptMovingStartEvent; public delegate void ScriptMovingEndEvent(uint localID); /// /// TODO: Should be triggered when a physics object stops moving. /// - public event ScriptMovingEndEvent OnScriptMovingEndEvent; + public ScriptMovingEndEvent OnScriptMovingEndEvent; public delegate void ScriptAtTargetEvent(UUID scriptID, uint handle, Vector3 targetpos, Vector3 atpos); @@ -581,7 +559,7 @@ namespace OpenSim.Region.Framework.Scenes /// via , /// via /// - public event ScriptAtTargetEvent OnScriptAtTargetEvent; + public ScriptAtTargetEvent OnScriptAtTargetEvent; public delegate void ScriptNotAtTargetEvent(UUID scriptID); @@ -595,7 +573,7 @@ namespace OpenSim.Region.Framework.Scenes /// via , /// via /// - public event ScriptNotAtTargetEvent OnScriptNotAtTargetEvent; + public ScriptNotAtTargetEvent OnScriptNotAtTargetEvent; public delegate void ScriptAtRotTargetEvent(UUID scriptID, uint handle, Quaternion targetrot, Quaternion atrot); @@ -609,7 +587,7 @@ namespace OpenSim.Region.Framework.Scenes /// via , /// via /// - public event ScriptAtRotTargetEvent OnScriptAtRotTargetEvent; + public ScriptAtRotTargetEvent OnScriptAtRotTargetEvent; public delegate void ScriptNotAtRotTargetEvent(UUID scriptID); @@ -623,7 +601,7 @@ namespace OpenSim.Region.Framework.Scenes /// via , /// via /// - public event ScriptNotAtRotTargetEvent OnScriptNotAtRotTargetEvent; + public ScriptNotAtRotTargetEvent OnScriptNotAtRotTargetEvent; public delegate void ScriptColliding(uint localID, ColliderArgs colliders); @@ -638,7 +616,7 @@ namespace OpenSim.Region.Framework.Scenes /// via /// via /// - public event ScriptColliding OnScriptColliderStart; + public ScriptColliding OnScriptColliderStart; /// /// Triggered when something that previously collided with a prim has @@ -652,7 +630,7 @@ namespace OpenSim.Region.Framework.Scenes /// via /// via /// - public event ScriptColliding OnScriptColliding; + public ScriptColliding OnScriptColliding; /// /// Triggered when something that previously collided with a prim has @@ -665,7 +643,7 @@ namespace OpenSim.Region.Framework.Scenes /// via /// via /// - public event ScriptColliding OnScriptCollidingEnd; + public ScriptColliding OnScriptCollidingEnd; /// /// Triggered when a physical collision has started between an object @@ -678,7 +656,7 @@ namespace OpenSim.Region.Framework.Scenes /// via /// via /// - public event ScriptColliding OnScriptLandColliderStart; + public ScriptColliding OnScriptLandColliderStart; /// /// Triggered when an object that previously collided with the region @@ -691,7 +669,7 @@ namespace OpenSim.Region.Framework.Scenes /// via /// via /// - public event ScriptColliding OnScriptLandColliding; + public ScriptColliding OnScriptLandColliding; /// /// Triggered when an object that previously collided with the region @@ -704,7 +682,7 @@ namespace OpenSim.Region.Framework.Scenes /// via /// via /// - public event ScriptColliding OnScriptLandColliderEnd; + public ScriptColliding OnScriptLandColliderEnd; public delegate void OnMakeChildAgentDelegate(ScenePresence presence); @@ -718,7 +696,7 @@ namespace OpenSim.Region.Framework.Scenes /// , /// /// - public event OnMakeChildAgentDelegate OnMakeChildAgent; + public OnMakeChildAgentDelegate OnMakeChildAgent; /// /// Triggered after the grunt work for adding a root agent to a @@ -734,26 +712,26 @@ namespace OpenSim.Region.Framework.Scenes /// via /// and /// - public event Action OnMakeRootAgent; + public Action OnMakeRootAgent; /// /// Triggered when an object or attachment enters a scene /// - public event OnIncomingSceneObjectDelegate OnIncomingSceneObject; + public OnIncomingSceneObjectDelegate OnIncomingSceneObject; public delegate void OnIncomingSceneObjectDelegate(SceneObjectGroup so); public delegate void NewInventoryItemUploadComplete(InventoryItemBase item, int userlevel); - public event NewInventoryItemUploadComplete OnNewInventoryItemUploadComplete; + public NewInventoryItemUploadComplete OnNewInventoryItemUploadComplete; public delegate void RequestChangeWaterHeight(float height); - public event RequestChangeWaterHeight OnRequestChangeWaterHeight; + public RequestChangeWaterHeight OnRequestChangeWaterHeight; /// /// Fired if any avatar is 'killed' due to its health falling to zero /// - public event AvatarKillData OnAvatarKilled; + public AvatarKillData OnAvatarKilled; public delegate void AvatarKillData(uint KillerLocalID, ScenePresence avatar); /* @@ -765,13 +743,13 @@ namespace OpenSim.Region.Framework.Scenes /// Triggered by /// via /// - public event ScriptTimerEvent OnScriptTimerEvent; + public ScriptTimerEvent OnScriptTimerEvent; */ public delegate void EstateToolsSunUpdate(ulong regionHandle); public delegate void GetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID); - public event EstateToolsSunUpdate OnEstateToolsSunUpdate; + public EstateToolsSunUpdate OnEstateToolsSunUpdate; /// /// Triggered when an object is added to the scene. @@ -782,13 +760,13 @@ namespace OpenSim.Region.Framework.Scenes /// , /// /// - public event Action OnObjectAddedToScene; + public Action OnObjectAddedToScene; /// /// When a client sends a derez request for an object inworld /// but before the object is deleted /// - public event DeRezRequested OnDeRezRequested; + public DeRezRequested OnDeRezRequested; /// /// Triggered when a client sends a derez request for an object inworld /// @@ -805,7 +783,7 @@ namespace OpenSim.Region.Framework.Scenes /// Triggered by /// in /// - public event ObjectBeingRemovedFromScene OnObjectBeingRemovedFromScene; + public ObjectBeingRemovedFromScene OnObjectBeingRemovedFromScene; /// /// Delegate for /// @@ -815,7 +793,7 @@ namespace OpenSim.Region.Framework.Scenes /// /// Triggered when an object is placed into the physical scene (PhysicsActor created). /// - public event Action OnObjectAddedToPhysicalScene; + public Action OnObjectAddedToPhysicalScene; /// /// Triggered when an object is removed from the physical scene (PhysicsActor destroyed). /// @@ -823,19 +801,19 @@ namespace OpenSim.Region.Framework.Scenes /// Note: this is triggered just before the PhysicsActor is removed from the /// physics engine so the receiver can do any necessary cleanup before its destruction. /// - public event Action OnObjectRemovedFromPhysicalScene; + public Action OnObjectRemovedFromPhysicalScene; public delegate void NoticeNoLandDataFromStorage(); - public event NoticeNoLandDataFromStorage OnNoticeNoLandDataFromStorage; + public NoticeNoLandDataFromStorage OnNoticeNoLandDataFromStorage; public delegate void IncomingLandDataFromStorage(List data); - public event IncomingLandDataFromStorage OnIncomingLandDataFromStorage; + public IncomingLandDataFromStorage OnIncomingLandDataFromStorage; public delegate void SetAllowForcefulBan(bool allow); - public event SetAllowForcefulBan OnSetAllowForcefulBan; + public SetAllowForcefulBan OnSetAllowForcefulBan; public delegate void RequestParcelPrimCountUpdate(); - public event RequestParcelPrimCountUpdate OnRequestParcelPrimCountUpdate; + public RequestParcelPrimCountUpdate OnRequestParcelPrimCountUpdate; public delegate void ParcelPrimCountTainted(); @@ -852,12 +830,11 @@ namespace OpenSim.Region.Framework.Scenes /// , /// /// - public event ParcelPrimCountTainted OnParcelPrimCountTainted; - public event GetScriptRunning OnGetScriptRunning; + public ParcelPrimCountTainted OnParcelPrimCountTainted; + public GetScriptRunning OnGetScriptRunning; public delegate void ThrottleUpdate(ScenePresence scenePresence); - - public event ThrottleUpdate OnThrottleUpdate; + public ThrottleUpdate OnThrottleUpdate; /// /// RegisterCapsEvent is called by Scene after the Caps object @@ -865,21 +842,21 @@ namespace OpenSim.Region.Framework.Scenes /// client and provides region modules to add their caps. /// public delegate void RegisterCapsEvent(UUID agentID, Caps caps); - public event RegisterCapsEvent OnRegisterCaps; + public RegisterCapsEvent OnRegisterCaps; /// /// DeregisterCapsEvent is called by Scene when the caps /// handler for an agent are removed. /// public delegate void DeregisterCapsEvent(UUID agentID, Caps caps); - public event DeregisterCapsEvent OnDeregisterCaps; + public DeregisterCapsEvent OnDeregisterCaps; /// /// ChatFromWorldEvent is called via Scene when a chat message /// from world comes in. /// public delegate void ChatFromWorldEvent(Object sender, OSChatMessage chat); - public event ChatFromWorldEvent OnChatFromWorld; + public ChatFromWorldEvent OnChatFromWorld; /// /// ChatFromClientEvent is triggered via ChatModule (or @@ -887,7 +864,7 @@ namespace OpenSim.Region.Framework.Scenes /// from the client comes in. /// public delegate void ChatFromClientEvent(Object sender, OSChatMessage chat); - public event ChatFromClientEvent OnChatFromClient; + public ChatFromClientEvent OnChatFromClient; /// /// ChatToClientsEvent is triggered via ChatModule (or @@ -898,17 +875,17 @@ namespace OpenSim.Region.Framework.Scenes UUID senderID, HashSet receiverIDs, string message, ChatTypeEnum type, Vector3 fromPos, string fromName, ChatSourceType src, ChatAudibleLevel level); - public event ChatToClientsEvent OnChatToClients; + public ChatToClientsEvent OnChatToClients; /// /// ChatBroadcastEvent is called via Scene when a broadcast chat message /// from world comes in /// public delegate void ChatBroadcastEvent(Object sender, OSChatMessage chat); - public event ChatBroadcastEvent OnChatBroadcast; + public ChatBroadcastEvent OnChatBroadcast; public delegate float SunLindenHour(); - public event SunLindenHour OnGetCurrentTimeAsLindenSunHour; + public SunLindenHour OnGetCurrentTimeAsLindenSunHour; /// /// Called when oar file has finished loading, although @@ -916,7 +893,7 @@ namespace OpenSim.Region.Framework.Scenes /// Message is non empty string if there were problems loading the oar file /// public delegate void OarFileLoaded(Guid guid, List loadedScenes, string message); - public event OarFileLoaded OnOarFileLoaded; + public OarFileLoaded OnOarFileLoaded; /// /// Called when an oar file has finished saving @@ -925,14 +902,14 @@ namespace OpenSim.Region.Framework.Scenes /// Guid.Empty is returned. /// public delegate void OarFileSaved(Guid guid, string message); - public event OarFileSaved OnOarFileSaved; + public OarFileSaved OnOarFileSaved; /// /// Called when the script compile queue becomes empty /// Returns the number of scripts which failed to start /// public delegate void EmptyScriptCompileQueue(int numScriptsFailed, string message); - public event EmptyScriptCompileQueue OnEmptyScriptCompileQueue; + public EmptyScriptCompileQueue OnEmptyScriptCompileQueue; /// /// Called whenever an object is attached, or detached from an in-world presence. @@ -940,13 +917,13 @@ namespace OpenSim.Region.Framework.Scenes /// If the object is being attached, then the avatarID will be present. If the object is being detached then /// the avatarID is UUID.Zero (I know, this doesn't make much sense but now it's historical). public delegate void Attach(uint localID, UUID itemID, UUID avatarID); - public event Attach OnAttach; + public Attach OnAttach; /// /// Called immediately after an object is loaded from storage. /// - public event SceneObjectDelegate OnSceneObjectLoaded; + public SceneObjectDelegate OnSceneObjectLoaded; public delegate void SceneObjectDelegate(SceneObjectGroup so); /// @@ -959,7 +936,7 @@ namespace OpenSim.Region.Framework.Scenes /// /// The original scene object being persisted. Changes here will stay in memory but will not be saved to storage on this save. /// - public event SceneObjectPreSaveDelegate OnSceneObjectPreSave; + public SceneObjectPreSaveDelegate OnSceneObjectPreSave; public delegate void SceneObjectPreSaveDelegate(SceneObjectGroup persistingSo, SceneObjectGroup originalSo); /// @@ -971,25 +948,25 @@ namespace OpenSim.Region.Framework.Scenes /// /// Triggered in /// - public event SceneObjectPartCopyDelegate OnSceneObjectPartCopy; + public SceneObjectPartCopyDelegate OnSceneObjectPartCopy; public delegate void SceneObjectPartCopyDelegate(SceneObjectPart copy, SceneObjectPart original, bool userExposed); public delegate void SceneObjectPartUpdated(SceneObjectPart sop, bool full); - public event SceneObjectPartUpdated OnSceneObjectPartUpdated; + public SceneObjectPartUpdated OnSceneObjectPartUpdated; public delegate void ScenePresenceUpdated(ScenePresence sp); - public event ScenePresenceUpdated OnScenePresenceUpdated; + public ScenePresenceUpdated OnScenePresenceUpdated; public delegate void RegionUp(GridRegion region); - public event RegionUp OnRegionUp; + public RegionUp OnRegionUp; public delegate void RegionStarted(Scene scene); - public event RegionStarted OnRegionStarted; + public RegionStarted OnRegionStarted; public delegate void RegionHeartbeatStart(Scene scene); - public event RegionHeartbeatStart OnRegionHeartbeatStart; + public RegionHeartbeatStart OnRegionHeartbeatStart; public delegate void RegionHeartbeatEnd(Scene scene); - public event RegionHeartbeatEnd OnRegionHeartbeatEnd; + public RegionHeartbeatEnd OnRegionHeartbeatEnd; /// /// Fired when logins to a region are enabled or disabled. @@ -998,7 +975,7 @@ namespace OpenSim.Region.Framework.Scenes /// /// /// Fired - public event RegionLoginsStatusChange OnRegionLoginsStatusChange; + public RegionLoginsStatusChange OnRegionLoginsStatusChange; public delegate void RegionLoginsStatusChange(IScene scene); /// @@ -1008,12 +985,10 @@ namespace OpenSim.Region.Framework.Scenes /// A region is considered ready when startup operations such as loading of scripts already on the region /// have been completed. /// - public event Action OnRegionReadyStatusChange; + public Action OnRegionReadyStatusChange; public delegate void PrimsLoaded(Scene s); - public event PrimsLoaded OnPrimsLoaded; - - public delegate void TeleportStart(IClientAPI client, GridRegion destination, GridRegion finalDestination, uint teleportFlags, bool gridLogout); + public PrimsLoaded OnPrimsLoaded; /// /// Triggered when a teleport starts @@ -1024,9 +999,8 @@ namespace OpenSim.Region.Framework.Scenes /// and /// via /// - public event TeleportStart OnTeleportStart; - - public delegate void TeleportFail(IClientAPI client, bool gridLogout); + public delegate void TeleportStart(IClientAPI client, GridRegion destination, GridRegion finalDestination, uint teleportFlags, bool gridLogout); + public TeleportStart OnTeleportStart; /// /// Trigered when a teleport fails. @@ -1036,28 +1010,14 @@ namespace OpenSim.Region.Framework.Scenes /// in /// via /// - public event TeleportFail OnTeleportFail; + public delegate void TeleportFail(IClientAPI client, bool gridLogout); + public TeleportFail OnTeleportFail; -// public delegate void GatherUuids(SceneObjectPart sop, IDictionary assetUuids); -// -// /// -// /// Triggered when UUIDs referenced by a scene object are being gathered for archiving, hg transfer, etc. -// /// -// /// -// /// The listener should add references to the IDictionary as appropriate. -// /// -// public event GatherUuids OnGatherUuids; - - public class MoneyTransferArgs : EventArgs + public class MoneyTransferArgs { public UUID sender; public UUID receiver; - - /// - /// Always false. The SL protocol sucks. - /// - public bool authenticated = false; - + public bool authenticated = false; // Always false public int amount; public int transactiontype; public string description; @@ -1072,14 +1032,11 @@ namespace OpenSim.Region.Framework.Scenes } } - public class LandBuyArgs : EventArgs + public class LandBuyArgs { public UUID agentId = UUID.Zero; - public UUID groupId = UUID.Zero; - public UUID parcelOwnerID = UUID.Zero; - public bool final = false; public bool groupOwned = false; public bool removeContribution = false; @@ -1109,9 +1066,6 @@ namespace OpenSim.Region.Framework.Scenes } public delegate void MoneyTransferEvent(Object sender, MoneyTransferArgs e); - - public delegate void LandBuy(Object sender, LandBuyArgs e); - /// /// Triggered when an attempt to transfer grid currency occurs /// @@ -1121,12 +1075,13 @@ namespace OpenSim.Region.Framework.Scenes /// via /// via /// - public event MoneyTransferEvent OnMoneyTransfer; + public MoneyTransferEvent OnMoneyTransfer; + public delegate void LandBuy(Object sender, LandBuyArgs e); /// /// Triggered after after /// - public event LandBuy OnLandBuy; + public LandBuy OnLandBuy; /// /// Triggered to allow or prevent a real estate transaction @@ -1135,7 +1090,7 @@ namespace OpenSim.Region.Framework.Scenes /// Triggered in /// /// - public event LandBuy OnValidateLandBuy; + public LandBuy OnValidateLandBuy; public void TriggerOnAttach(uint localID, UUID itemID, UUID avatarID) {