diff options
author | onefang | 2019-09-11 16:36:50 +1000 |
---|---|---|
committer | onefang | 2019-09-11 16:36:50 +1000 |
commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Region/Framework/Scenes/EventManager.cs | |
parent | Renamed branch to SledjChisl. (diff) | |
parent | Bump to release flavour, build 0. (diff) | |
download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz |
Merge branch 'SledjChisl'
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/EventManager.cs | 337 |
1 files changed, 201 insertions, 136 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index 97b9482..f76f882 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs | |||
@@ -44,7 +44,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
44 | public class EventManager | 44 | public class EventManager |
45 | { | 45 | { |
46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
47 | 47 | ||
48 | public delegate void OnFrameDelegate(); | 48 | public delegate void OnFrameDelegate(); |
49 | 49 | ||
50 | /// <summary> | 50 | /// <summary> |
@@ -80,6 +80,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
80 | public event OnTerrainTaintedDelegate OnTerrainTainted; | 80 | public event OnTerrainTaintedDelegate OnTerrainTainted; |
81 | 81 | ||
82 | public delegate void OnTerrainTickDelegate(); | 82 | public delegate void OnTerrainTickDelegate(); |
83 | public delegate void OnTerrainCheckUpdatesDelegate(); | ||
83 | 84 | ||
84 | /// <summary> | 85 | /// <summary> |
85 | /// Triggered if the terrain has been edited | 86 | /// Triggered if the terrain has been edited |
@@ -89,6 +90,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
89 | /// but is used by core solely to update the physics engine. | 90 | /// but is used by core solely to update the physics engine. |
90 | /// </remarks> | 91 | /// </remarks> |
91 | public event OnTerrainTickDelegate OnTerrainTick; | 92 | public event OnTerrainTickDelegate OnTerrainTick; |
93 | public event OnTerrainCheckUpdatesDelegate OnTerrainCheckUpdates; | ||
94 | |||
95 | public delegate void OnTerrainUpdateDelegate(); | ||
96 | |||
97 | public event OnTerrainUpdateDelegate OnTerrainUpdate; | ||
92 | 98 | ||
93 | public delegate void OnBackupDelegate(ISimulationDataService datastore, bool forceBackup); | 99 | public delegate void OnBackupDelegate(ISimulationDataService datastore, bool forceBackup); |
94 | 100 | ||
@@ -115,7 +121,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
115 | public event OnClientConnectCoreDelegate OnClientConnect; | 121 | public event OnClientConnectCoreDelegate OnClientConnect; |
116 | 122 | ||
117 | public delegate void OnNewClientDelegate(IClientAPI client); | 123 | public delegate void OnNewClientDelegate(IClientAPI client); |
118 | 124 | ||
119 | /// <summary> | 125 | /// <summary> |
120 | /// Triggered when a new client is added to the scene. | 126 | /// Triggered when a new client is added to the scene. |
121 | /// </summary> | 127 | /// </summary> |
@@ -157,7 +163,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
157 | /// <remarks> | 163 | /// <remarks> |
158 | /// Triggered in <see cref="OpenSim.Region.Framework.Scenes.Scene.AddNewAgent"/> which is used by both | 164 | /// Triggered in <see cref="OpenSim.Region.Framework.Scenes.Scene.AddNewAgent"/> which is used by both |
159 | /// <see cref="OpenSim.Framework.PresenceType.User">users</see> and <see cref="OpenSim.Framework.PresenceType.Npc">NPCs</see> | 165 | /// <see cref="OpenSim.Framework.PresenceType.User">users</see> and <see cref="OpenSim.Framework.PresenceType.Npc">NPCs</see> |
160 | /// | 166 | /// |
161 | /// Triggered under per-agent lock. So if you want to perform any long-running operations, please | 167 | /// Triggered under per-agent lock. So if you want to perform any long-running operations, please |
162 | /// do this on a separate thread. | 168 | /// do this on a separate thread. |
163 | /// </remarks> | 169 | /// </remarks> |
@@ -217,7 +223,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
217 | /// Triggered when the entire simulator is shutdown. | 223 | /// Triggered when the entire simulator is shutdown. |
218 | /// </summary> | 224 | /// </summary> |
219 | public event Action OnShutdown; | 225 | public event Action OnShutdown; |
220 | 226 | ||
221 | public delegate void ObjectDeGrabDelegate(uint localID, uint originalID, IClientAPI remoteClient, SurfaceTouchEventArgs surfaceArgs); | 227 | public delegate void ObjectDeGrabDelegate(uint localID, uint originalID, IClientAPI remoteClient, SurfaceTouchEventArgs surfaceArgs); |
222 | public delegate void ScriptResetDelegate(uint localID, UUID itemID); | 228 | public delegate void ScriptResetDelegate(uint localID, UUID itemID); |
223 | 229 | ||
@@ -270,7 +276,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
270 | /// </remarks> | 276 | /// </remarks> |
271 | public event ObjectGrabDelegate OnObjectGrab; | 277 | public event ObjectGrabDelegate OnObjectGrab; |
272 | public delegate void ObjectGrabDelegate(uint localID, uint originalID, Vector3 offsetPos, IClientAPI remoteClient, SurfaceTouchEventArgs surfaceArgs); | 278 | public delegate void ObjectGrabDelegate(uint localID, uint originalID, Vector3 offsetPos, IClientAPI remoteClient, SurfaceTouchEventArgs surfaceArgs); |
273 | 279 | ||
274 | /// <summary> | 280 | /// <summary> |
275 | /// Triggered when an object is being touched/grabbed continuously. | 281 | /// Triggered when an object is being touched/grabbed continuously. |
276 | /// </summary> | 282 | /// </summary> |
@@ -339,8 +345,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
339 | /// in <see cref="Scene.SetScriptRunning"/> | 345 | /// in <see cref="Scene.SetScriptRunning"/> |
340 | /// via <see cref="OpenSim.Framework.IClientAPI.OnSetScriptRunning"/>, | 346 | /// via <see cref="OpenSim.Framework.IClientAPI.OnSetScriptRunning"/>, |
341 | /// via <see cref="OpenSim.Region.ClientStack.LindenUDP.HandleSetScriptRunning"/> | 347 | /// via <see cref="OpenSim.Region.ClientStack.LindenUDP.HandleSetScriptRunning"/> |
342 | /// XXX: This is only triggered when it is the client that starts the script, not in other situations where | ||
343 | /// a script is started, unlike OnStopScript! | ||
344 | /// </remarks> | 348 | /// </remarks> |
345 | public event StartScript OnStartScript; | 349 | public event StartScript OnStartScript; |
346 | 350 | ||
@@ -354,7 +358,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
354 | /// in <see cref="SceneObjectPartInventory.CreateScriptInstance"/>, | 358 | /// in <see cref="SceneObjectPartInventory.CreateScriptInstance"/>, |
355 | /// <see cref="SceneObjectPartInventory.StopScriptInstance"/>, | 359 | /// <see cref="SceneObjectPartInventory.StopScriptInstance"/>, |
356 | /// <see cref="Scene.SetScriptRunning"/> | 360 | /// <see cref="Scene.SetScriptRunning"/> |
357 | /// XXX: This is triggered when a sciprt is stopped for any reason, unlike OnStartScript! | ||
358 | /// </remarks> | 361 | /// </remarks> |
359 | public event StopScript OnStopScript; | 362 | public event StopScript OnStopScript; |
360 | 363 | ||
@@ -500,7 +503,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
500 | /// via <see cref="OpenSim.Region.ClientStack.Linden.TaskInventoryScriptUpdater.uploaderCaps"/> | 503 | /// via <see cref="OpenSim.Region.ClientStack.Linden.TaskInventoryScriptUpdater.uploaderCaps"/> |
501 | /// </remarks> | 504 | /// </remarks> |
502 | public event UpdateScript OnUpdateScript; | 505 | public event UpdateScript OnUpdateScript; |
503 | 506 | ||
504 | public virtual void TriggerUpdateScript(UUID clientId, UUID itemId, UUID primId, bool isScriptRunning, UUID newAssetID) | 507 | public virtual void TriggerUpdateScript(UUID clientId, UUID itemId, UUID primId, bool isScriptRunning, UUID newAssetID) |
505 | { | 508 | { |
506 | UpdateScript handlerUpdateScript = OnUpdateScript; | 509 | UpdateScript handlerUpdateScript = OnUpdateScript; |
@@ -520,16 +523,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
520 | } | 523 | } |
521 | } | 524 | } |
522 | } | 525 | } |
523 | } | 526 | } |
524 | 527 | ||
525 | /// <summary> | 528 | /// <summary> |
526 | /// Triggered when some scene object properties change. | 529 | /// Triggered when some scene object properties change. |
527 | /// </summary> | 530 | /// </summary> |
528 | /// <remarks> | 531 | /// <remarks> |
529 | /// ScriptChangedEvent is fired when a scene object property that a script might be interested | 532 | /// ScriptChangedEvent is fired when a scene object property that a script might be interested |
530 | /// in (such as color, scale or inventory) changes. Only enough information sent is for the LSL changed event. | 533 | /// in (such as color, scale or inventory) changes. Only enough information sent is for the LSL changed event. |
531 | /// This is not an indication that the script has changed (see OnUpdateScript for that). | 534 | /// This is not an indication that the script has changed (see OnUpdateScript for that). |
532 | /// This event is sent to a script to tell it that some property changed on | 535 | /// This event is sent to a script to tell it that some property changed on |
533 | /// the object the script is in. See http://lslwiki.net/lslwiki/wakka.php?wakka=changed . | 536 | /// the object the script is in. See http://lslwiki.net/lslwiki/wakka.php?wakka=changed . |
534 | /// Triggered by <see cref="TriggerOnScriptChangedEvent"/> | 537 | /// Triggered by <see cref="TriggerOnScriptChangedEvent"/> |
535 | /// in <see cref="OpenSim.Region.CoreModules.Framework.EntityTransfer.EntityTransferModule.TeleportAgentWithinRegion"/>, | 538 | /// in <see cref="OpenSim.Region.CoreModules.Framework.EntityTransfer.EntityTransferModule.TeleportAgentWithinRegion"/>, |
@@ -558,7 +561,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
558 | /// TODO: Should be triggered when a physics object starts moving. | 561 | /// TODO: Should be triggered when a physics object starts moving. |
559 | /// </summary> | 562 | /// </summary> |
560 | public event ScriptMovingStartEvent OnScriptMovingStartEvent; | 563 | public event ScriptMovingStartEvent OnScriptMovingStartEvent; |
561 | 564 | ||
562 | public delegate void ScriptMovingEndEvent(uint localID); | 565 | public delegate void ScriptMovingEndEvent(uint localID); |
563 | 566 | ||
564 | /// <summary> | 567 | /// <summary> |
@@ -735,7 +738,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
735 | /// and <see cref="ScenePresence.CompleteMovement"/> | 738 | /// and <see cref="ScenePresence.CompleteMovement"/> |
736 | /// </remarks> | 739 | /// </remarks> |
737 | public event Action<ScenePresence> OnMakeRootAgent; | 740 | public event Action<ScenePresence> OnMakeRootAgent; |
738 | 741 | ||
739 | public event OnSendNewWindlightProfileTargetedDelegate OnSendNewWindlightProfileTargeted; | 742 | public event OnSendNewWindlightProfileTargetedDelegate OnSendNewWindlightProfileTargeted; |
740 | public event OnSaveNewWindlightProfileDelegate OnSaveNewWindlightProfile; | 743 | public event OnSaveNewWindlightProfileDelegate OnSaveNewWindlightProfile; |
741 | 744 | ||
@@ -745,14 +748,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
745 | public event OnIncomingSceneObjectDelegate OnIncomingSceneObject; | 748 | public event OnIncomingSceneObjectDelegate OnIncomingSceneObject; |
746 | public delegate void OnIncomingSceneObjectDelegate(SceneObjectGroup so); | 749 | public delegate void OnIncomingSceneObjectDelegate(SceneObjectGroup so); |
747 | 750 | ||
748 | public delegate void NewInventoryItemUploadComplete(UUID avatarID, AssetType type, UUID assetID, string name, int userlevel); | 751 | public delegate void NewInventoryItemUploadComplete(InventoryItemBase item, int userlevel); |
749 | 752 | ||
750 | public event NewInventoryItemUploadComplete OnNewInventoryItemUploadComplete; | 753 | public event NewInventoryItemUploadComplete OnNewInventoryItemUploadComplete; |
751 | 754 | ||
752 | public delegate void RequestChangeWaterHeight(float height); | 755 | public delegate void RequestChangeWaterHeight(float height); |
753 | 756 | ||
754 | public event RequestChangeWaterHeight OnRequestChangeWaterHeight; | 757 | public event RequestChangeWaterHeight OnRequestChangeWaterHeight; |
755 | 758 | ||
756 | /// <summary> | 759 | /// <summary> |
757 | /// Fired if any avatar is 'killed' due to its health falling to zero | 760 | /// Fired if any avatar is 'killed' due to its health falling to zero |
758 | /// </summary> | 761 | /// </summary> |
@@ -775,7 +778,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
775 | public delegate void GetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID); | 778 | public delegate void GetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID); |
776 | 779 | ||
777 | public event EstateToolsSunUpdate OnEstateToolsSunUpdate; | 780 | public event EstateToolsSunUpdate OnEstateToolsSunUpdate; |
778 | 781 | ||
779 | /// <summary> | 782 | /// <summary> |
780 | /// Triggered when an object is added to the scene. | 783 | /// Triggered when an object is added to the scene. |
781 | /// </summary> | 784 | /// </summary> |
@@ -786,7 +789,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
786 | /// <see cref="Scene.doObjectDuplicateOnRay"/> | 789 | /// <see cref="Scene.doObjectDuplicateOnRay"/> |
787 | /// </remarks> | 790 | /// </remarks> |
788 | public event Action<SceneObjectGroup> OnObjectAddedToScene; | 791 | public event Action<SceneObjectGroup> OnObjectAddedToScene; |
789 | 792 | ||
790 | /// <summary> | 793 | /// <summary> |
791 | /// When a client sends a derez request for an object inworld | 794 | /// When a client sends a derez request for an object inworld |
792 | /// but before the object is deleted | 795 | /// but before the object is deleted |
@@ -852,12 +855,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
852 | /// <see cref="Scene.DeleteSceneObject"/>, | 855 | /// <see cref="Scene.DeleteSceneObject"/>, |
853 | /// <see cref="Scene.SelectPrim"/>, | 856 | /// <see cref="Scene.SelectPrim"/>, |
854 | /// <see cref="Scene.DeselectPrim"/>, | 857 | /// <see cref="Scene.DeselectPrim"/>, |
855 | /// <see cref="SceneObjectGroup.UpdatePrimFlags"/>, | 858 | /// <see cref="SceneObjectGroup.UpdateFlags"/>, |
856 | /// <see cref="SceneObjectGroup.AbsolutePosition"/> | 859 | /// <see cref="SceneObjectGroup.AbsolutePosition"/> |
857 | /// </remarks> | 860 | /// </remarks> |
858 | public event ParcelPrimCountTainted OnParcelPrimCountTainted; | 861 | public event ParcelPrimCountTainted OnParcelPrimCountTainted; |
859 | public event GetScriptRunning OnGetScriptRunning; | 862 | public event GetScriptRunning OnGetScriptRunning; |
860 | 863 | ||
864 | public delegate void ThrottleUpdate(ScenePresence scenePresence); | ||
865 | |||
866 | public event ThrottleUpdate OnThrottleUpdate; | ||
867 | |||
861 | /// <summary> | 868 | /// <summary> |
862 | /// RegisterCapsEvent is called by Scene after the Caps object | 869 | /// RegisterCapsEvent is called by Scene after the Caps object |
863 | /// has been instantiated and before it is return to the | 870 | /// has been instantiated and before it is return to the |
@@ -865,21 +872,21 @@ namespace OpenSim.Region.Framework.Scenes | |||
865 | /// </summary> | 872 | /// </summary> |
866 | public delegate void RegisterCapsEvent(UUID agentID, Caps caps); | 873 | public delegate void RegisterCapsEvent(UUID agentID, Caps caps); |
867 | public event RegisterCapsEvent OnRegisterCaps; | 874 | public event RegisterCapsEvent OnRegisterCaps; |
868 | 875 | ||
869 | /// <summary> | 876 | /// <summary> |
870 | /// DeregisterCapsEvent is called by Scene when the caps | 877 | /// DeregisterCapsEvent is called by Scene when the caps |
871 | /// handler for an agent are removed. | 878 | /// handler for an agent are removed. |
872 | /// </summary> | 879 | /// </summary> |
873 | public delegate void DeregisterCapsEvent(UUID agentID, Caps caps); | 880 | public delegate void DeregisterCapsEvent(UUID agentID, Caps caps); |
874 | public event DeregisterCapsEvent OnDeregisterCaps; | 881 | public event DeregisterCapsEvent OnDeregisterCaps; |
875 | 882 | ||
876 | /// <summary> | 883 | /// <summary> |
877 | /// ChatFromWorldEvent is called via Scene when a chat message | 884 | /// ChatFromWorldEvent is called via Scene when a chat message |
878 | /// from world comes in. | 885 | /// from world comes in. |
879 | /// </summary> | 886 | /// </summary> |
880 | public delegate void ChatFromWorldEvent(Object sender, OSChatMessage chat); | 887 | public delegate void ChatFromWorldEvent(Object sender, OSChatMessage chat); |
881 | public event ChatFromWorldEvent OnChatFromWorld; | 888 | public event ChatFromWorldEvent OnChatFromWorld; |
882 | 889 | ||
883 | /// <summary> | 890 | /// <summary> |
884 | /// ChatFromClientEvent is triggered via ChatModule (or | 891 | /// ChatFromClientEvent is triggered via ChatModule (or |
885 | /// substitutes thereof) when a chat message | 892 | /// substitutes thereof) when a chat message |
@@ -887,18 +894,18 @@ namespace OpenSim.Region.Framework.Scenes | |||
887 | /// </summary> | 894 | /// </summary> |
888 | public delegate void ChatFromClientEvent(Object sender, OSChatMessage chat); | 895 | public delegate void ChatFromClientEvent(Object sender, OSChatMessage chat); |
889 | public event ChatFromClientEvent OnChatFromClient; | 896 | public event ChatFromClientEvent OnChatFromClient; |
890 | 897 | ||
891 | /// <summary> | 898 | /// <summary> |
892 | /// ChatToClientsEvent is triggered via ChatModule (or | 899 | /// ChatToClientsEvent is triggered via ChatModule (or |
893 | /// substitutes thereof) when a chat message is actually sent to clients. Clients will only be sent a | 900 | /// substitutes thereof) when a chat message is actually sent to clients. Clients will only be sent a |
894 | /// received chat message if they satisfy various conditions (within audible range, etc.) | 901 | /// received chat message if they satisfy various conditions (within audible range, etc.) |
895 | /// </summary> | 902 | /// </summary> |
896 | public delegate void ChatToClientsEvent( | 903 | public delegate void ChatToClientsEvent( |
897 | UUID senderID, HashSet<UUID> receiverIDs, | 904 | UUID senderID, HashSet<UUID> receiverIDs, |
898 | string message, ChatTypeEnum type, Vector3 fromPos, string fromName, | 905 | string message, ChatTypeEnum type, Vector3 fromPos, string fromName, |
899 | ChatSourceType src, ChatAudibleLevel level); | 906 | ChatSourceType src, ChatAudibleLevel level); |
900 | public event ChatToClientsEvent OnChatToClients; | 907 | public event ChatToClientsEvent OnChatToClients; |
901 | 908 | ||
902 | /// <summary> | 909 | /// <summary> |
903 | /// ChatBroadcastEvent is called via Scene when a broadcast chat message | 910 | /// ChatBroadcastEvent is called via Scene when a broadcast chat message |
904 | /// from world comes in | 911 | /// from world comes in |
@@ -916,11 +923,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
916 | /// </summary> | 923 | /// </summary> |
917 | public delegate void OarFileLoaded(Guid guid, List<UUID> loadedScenes, string message); | 924 | public delegate void OarFileLoaded(Guid guid, List<UUID> loadedScenes, string message); |
918 | public event OarFileLoaded OnOarFileLoaded; | 925 | public event OarFileLoaded OnOarFileLoaded; |
919 | 926 | ||
920 | /// <summary> | 927 | /// <summary> |
921 | /// Called when an oar file has finished saving | 928 | /// Called when an oar file has finished saving |
922 | /// Message is non empty string if there were problems saving the oar file | 929 | /// Message is non empty string if there were problems saving the oar file |
923 | /// If a guid was supplied on the original call to identify, the request, this is returned. Otherwise | 930 | /// If a guid was supplied on the original call to identify, the request, this is returned. Otherwise |
924 | /// Guid.Empty is returned. | 931 | /// Guid.Empty is returned. |
925 | /// </summary> | 932 | /// </summary> |
926 | public delegate void OarFileSaved(Guid guid, string message); | 933 | public delegate void OarFileSaved(Guid guid, string message); |
@@ -940,14 +947,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
940 | /// the avatarID is UUID.Zero (I know, this doesn't make much sense but now it's historical). | 947 | /// the avatarID is UUID.Zero (I know, this doesn't make much sense but now it's historical). |
941 | public delegate void Attach(uint localID, UUID itemID, UUID avatarID); | 948 | public delegate void Attach(uint localID, UUID itemID, UUID avatarID); |
942 | public event Attach OnAttach; | 949 | public event Attach OnAttach; |
943 | 950 | ||
944 | 951 | ||
945 | /// <summary> | 952 | /// <summary> |
946 | /// Called immediately after an object is loaded from storage. | 953 | /// Called immediately after an object is loaded from storage. |
947 | /// </summary> | 954 | /// </summary> |
948 | public event SceneObjectDelegate OnSceneObjectLoaded; | 955 | public event SceneObjectDelegate OnSceneObjectLoaded; |
949 | public delegate void SceneObjectDelegate(SceneObjectGroup so); | 956 | public delegate void SceneObjectDelegate(SceneObjectGroup so); |
950 | 957 | ||
951 | /// <summary> | 958 | /// <summary> |
952 | /// Called immediately before an object is saved to storage. | 959 | /// Called immediately before an object is saved to storage. |
953 | /// </summary> | 960 | /// </summary> |
@@ -960,7 +967,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
960 | /// </param> | 967 | /// </param> |
961 | public event SceneObjectPreSaveDelegate OnSceneObjectPreSave; | 968 | public event SceneObjectPreSaveDelegate OnSceneObjectPreSave; |
962 | public delegate void SceneObjectPreSaveDelegate(SceneObjectGroup persistingSo, SceneObjectGroup originalSo); | 969 | public delegate void SceneObjectPreSaveDelegate(SceneObjectGroup persistingSo, SceneObjectGroup originalSo); |
963 | 970 | ||
964 | /// <summary> | 971 | /// <summary> |
965 | /// Called when a scene object part is cloned within the region. | 972 | /// Called when a scene object part is cloned within the region. |
966 | /// </summary> | 973 | /// </summary> |
@@ -994,7 +1001,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
994 | /// Fired when logins to a region are enabled or disabled. | 1001 | /// Fired when logins to a region are enabled or disabled. |
995 | /// </summary> | 1002 | /// </summary> |
996 | /// <remarks> | 1003 | /// <remarks> |
997 | /// | 1004 | /// |
998 | /// </remarks> | 1005 | /// </remarks> |
999 | /// Fired | 1006 | /// Fired |
1000 | public event RegionLoginsStatusChange OnRegionLoginsStatusChange; | 1007 | public event RegionLoginsStatusChange OnRegionLoginsStatusChange; |
@@ -1150,7 +1157,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1150 | catch (Exception e) | 1157 | catch (Exception e) |
1151 | { | 1158 | { |
1152 | m_log.ErrorFormat( | 1159 | m_log.ErrorFormat( |
1153 | "[EVENT MANAGER]: Delegate for TriggerOnAttach failed - continuing. {0} {1}", | 1160 | "[EVENT MANAGER]: Delegate for TriggerOnAttach failed - continuing. {0} {1}", |
1154 | e.Message, e.StackTrace); | 1161 | e.Message, e.StackTrace); |
1155 | } | 1162 | } |
1156 | } | 1163 | } |
@@ -1171,7 +1178,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1171 | catch (Exception e) | 1178 | catch (Exception e) |
1172 | { | 1179 | { |
1173 | m_log.ErrorFormat( | 1180 | m_log.ErrorFormat( |
1174 | "[EVENT MANAGER]: Delegate for TriggerGetScriptRunning failed - continuing. {0} {1}", | 1181 | "[EVENT MANAGER]: Delegate for TriggerGetScriptRunning failed - continuing. {0} {1}", |
1175 | e.Message, e.StackTrace); | 1182 | e.Message, e.StackTrace); |
1176 | } | 1183 | } |
1177 | } | 1184 | } |
@@ -1192,7 +1199,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1192 | catch (Exception e) | 1199 | catch (Exception e) |
1193 | { | 1200 | { |
1194 | m_log.ErrorFormat( | 1201 | m_log.ErrorFormat( |
1195 | "[EVENT MANAGER]: Delegate for TriggerOnScriptChangedEvent failed - continuing. {0} {1}", | 1202 | "[EVENT MANAGER]: Delegate for TriggerOnScriptChangedEvent failed - continuing. {0} {1}", |
1196 | e.Message, e.StackTrace); | 1203 | e.Message, e.StackTrace); |
1197 | } | 1204 | } |
1198 | } | 1205 | } |
@@ -1213,7 +1220,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1213 | catch (Exception e) | 1220 | catch (Exception e) |
1214 | { | 1221 | { |
1215 | m_log.ErrorFormat( | 1222 | m_log.ErrorFormat( |
1216 | "[EVENT MANAGER]: Delegate for TriggerOnClientMovement failed - continuing. {0} {1}", | 1223 | "[EVENT MANAGER]: Delegate for TriggerOnClientMovement failed - continuing. {0} {1}", |
1217 | e.Message, e.StackTrace); | 1224 | e.Message, e.StackTrace); |
1218 | } | 1225 | } |
1219 | } | 1226 | } |
@@ -1234,7 +1241,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1234 | catch (Exception e) | 1241 | catch (Exception e) |
1235 | { | 1242 | { |
1236 | m_log.ErrorFormat( | 1243 | m_log.ErrorFormat( |
1237 | "[EVENT MANAGER]: Delegate for TriggerPermissionError failed - continuing. {0} {1}", | 1244 | "[EVENT MANAGER]: Delegate for TriggerPermissionError failed - continuing. {0} {1}", |
1238 | e.Message, e.StackTrace); | 1245 | e.Message, e.StackTrace); |
1239 | } | 1246 | } |
1240 | } | 1247 | } |
@@ -1255,7 +1262,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1255 | catch (Exception e) | 1262 | catch (Exception e) |
1256 | { | 1263 | { |
1257 | m_log.ErrorFormat( | 1264 | m_log.ErrorFormat( |
1258 | "[EVENT MANAGER]: Delegate for TriggerOnPluginConsole failed - continuing. {0} {1}", | 1265 | "[EVENT MANAGER]: Delegate for TriggerOnPluginConsole failed - continuing. {0} {1}", |
1259 | e.Message, e.StackTrace); | 1266 | e.Message, e.StackTrace); |
1260 | } | 1267 | } |
1261 | } | 1268 | } |
@@ -1276,7 +1283,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1276 | catch (Exception e) | 1283 | catch (Exception e) |
1277 | { | 1284 | { |
1278 | m_log.ErrorFormat( | 1285 | m_log.ErrorFormat( |
1279 | "[EVENT MANAGER]: Delegate for TriggerOnFrame failed - continuing. {0} {1}", | 1286 | "[EVENT MANAGER]: Delegate for TriggerOnFrame failed - continuing. {0} {1}", |
1280 | e.Message, e.StackTrace); | 1287 | e.Message, e.StackTrace); |
1281 | } | 1288 | } |
1282 | } | 1289 | } |
@@ -1297,7 +1304,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1297 | catch (Exception e) | 1304 | catch (Exception e) |
1298 | { | 1305 | { |
1299 | m_log.ErrorFormat( | 1306 | m_log.ErrorFormat( |
1300 | "[EVENT MANAGER]: Delegate for TriggerOnNewClient failed - continuing. {0} {1}", | 1307 | "[EVENT MANAGER]: Delegate for TriggerOnNewClient failed - continuing. {0} {1}", |
1301 | e.Message, e.StackTrace); | 1308 | e.Message, e.StackTrace); |
1302 | } | 1309 | } |
1303 | } | 1310 | } |
@@ -1317,7 +1324,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1317 | catch (Exception e) | 1324 | catch (Exception e) |
1318 | { | 1325 | { |
1319 | m_log.ErrorFormat( | 1326 | m_log.ErrorFormat( |
1320 | "[EVENT MANAGER]: Delegate for TriggerOnNewClient (IClientCore) failed - continuing. {0} {1}", | 1327 | "[EVENT MANAGER]: Delegate for TriggerOnNewClient (IClientCore) failed - continuing. {0} {1}", |
1321 | e.Message, e.StackTrace); | 1328 | e.Message, e.StackTrace); |
1322 | } | 1329 | } |
1323 | } | 1330 | } |
@@ -1361,7 +1368,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1361 | catch (Exception e) | 1368 | catch (Exception e) |
1362 | { | 1369 | { |
1363 | m_log.ErrorFormat( | 1370 | m_log.ErrorFormat( |
1364 | "[EVENT MANAGER]: Delegate for TriggerOnNewPresence failed - continuing. {0} {1}", | 1371 | "[EVENT MANAGER]: Delegate for TriggerOnNewPresence failed - continuing. {0} {1}", |
1365 | e.Message, e.StackTrace); | 1372 | e.Message, e.StackTrace); |
1366 | } | 1373 | } |
1367 | } | 1374 | } |
@@ -1377,12 +1384,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
1377 | { | 1384 | { |
1378 | try | 1385 | try |
1379 | { | 1386 | { |
1387 | // m_log.ErrorFormat("[EVENT MANAGER]: OnRemovePresenceDelegate: {0}",d.Target.ToString()); | ||
1380 | d(agentId); | 1388 | d(agentId); |
1389 | // m_log.ErrorFormat("[EVENT MANAGER]: OnRemovePresenceDelegate done "); | ||
1381 | } | 1390 | } |
1382 | catch (Exception e) | 1391 | catch (Exception e) |
1383 | { | 1392 | { |
1384 | m_log.ErrorFormat( | 1393 | m_log.ErrorFormat( |
1385 | "[EVENT MANAGER]: Delegate for TriggerOnRemovePresence failed - continuing. {0} {1}", | 1394 | "[EVENT MANAGER]: Delegate for TriggerOnRemovePresence failed - continuing. {0} {1}", |
1386 | e.Message, e.StackTrace); | 1395 | e.Message, e.StackTrace); |
1387 | } | 1396 | } |
1388 | } | 1397 | } |
@@ -1403,7 +1412,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1403 | catch (Exception e) | 1412 | catch (Exception e) |
1404 | { | 1413 | { |
1405 | m_log.ErrorFormat( | 1414 | m_log.ErrorFormat( |
1406 | "[EVENT MANAGER]: Delegate for TriggerOnBackup failed - continuing. {0} {1}", | 1415 | "[EVENT MANAGER]: Delegate for TriggerOnBackup failed - continuing. {0} {1}", |
1407 | e.Message, e.StackTrace); | 1416 | e.Message, e.StackTrace); |
1408 | } | 1417 | } |
1409 | } | 1418 | } |
@@ -1424,7 +1433,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1424 | catch (Exception e) | 1433 | catch (Exception e) |
1425 | { | 1434 | { |
1426 | m_log.ErrorFormat( | 1435 | m_log.ErrorFormat( |
1427 | "[EVENT MANAGER]: Delegate for TriggerParcelPrimCountUpdate failed - continuing. {0} {1}", | 1436 | "[EVENT MANAGER]: Delegate for TriggerParcelPrimCountUpdate failed - continuing. {0} {1}", |
1428 | e.Message, e.StackTrace); | 1437 | e.Message, e.StackTrace); |
1429 | } | 1438 | } |
1430 | } | 1439 | } |
@@ -1445,7 +1454,27 @@ namespace OpenSim.Region.Framework.Scenes | |||
1445 | catch (Exception e) | 1454 | catch (Exception e) |
1446 | { | 1455 | { |
1447 | m_log.ErrorFormat( | 1456 | m_log.ErrorFormat( |
1448 | "[EVENT MANAGER]: Delegate for TriggerMoneyTransfer failed - continuing. {0} {1}", | 1457 | "[EVENT MANAGER]: Delegate for TriggerMoneyTransfer failed - continuing. {0} {1}", |
1458 | e.Message, e.StackTrace); | ||
1459 | } | ||
1460 | } | ||
1461 | } | ||
1462 | } | ||
1463 | public void TriggerTerrainUpdate() | ||
1464 | { | ||
1465 | OnTerrainUpdateDelegate handlerTerrainUpdate = OnTerrainUpdate; | ||
1466 | if (handlerTerrainUpdate != null) | ||
1467 | { | ||
1468 | foreach (OnTerrainUpdateDelegate d in handlerTerrainUpdate.GetInvocationList()) | ||
1469 | { | ||
1470 | try | ||
1471 | { | ||
1472 | d(); | ||
1473 | } | ||
1474 | catch (Exception e) | ||
1475 | { | ||
1476 | m_log.ErrorFormat( | ||
1477 | "[EVENT MANAGER]: Delegate for TriggerTerrainUpdate failed - continuing. {0} {1}", | ||
1449 | e.Message, e.StackTrace); | 1478 | e.Message, e.StackTrace); |
1450 | } | 1479 | } |
1451 | } | 1480 | } |
@@ -1466,7 +1495,28 @@ namespace OpenSim.Region.Framework.Scenes | |||
1466 | catch (Exception e) | 1495 | catch (Exception e) |
1467 | { | 1496 | { |
1468 | m_log.ErrorFormat( | 1497 | m_log.ErrorFormat( |
1469 | "[EVENT MANAGER]: Delegate for TriggerTerrainTick failed - continuing. {0} {1}", | 1498 | "[EVENT MANAGER]: Delegate for TriggerTerrainTick failed - continuing. {0} {1}", |
1499 | e.Message, e.StackTrace); | ||
1500 | } | ||
1501 | } | ||
1502 | } | ||
1503 | } | ||
1504 | |||
1505 | public void TriggerTerrainCheckUpdates() | ||
1506 | { | ||
1507 | OnTerrainCheckUpdatesDelegate TerrainCheckUpdates = OnTerrainCheckUpdates; | ||
1508 | if (TerrainCheckUpdates != null) | ||
1509 | { | ||
1510 | foreach (OnTerrainCheckUpdatesDelegate d in TerrainCheckUpdates.GetInvocationList()) | ||
1511 | { | ||
1512 | try | ||
1513 | { | ||
1514 | d(); | ||
1515 | } | ||
1516 | catch (Exception e) | ||
1517 | { | ||
1518 | m_log.ErrorFormat( | ||
1519 | "[EVENT MANAGER]: Delegate for TerrainCheckUpdates failed - continuing. {0} {1}", | ||
1470 | e.Message, e.StackTrace); | 1520 | e.Message, e.StackTrace); |
1471 | } | 1521 | } |
1472 | } | 1522 | } |
@@ -1508,7 +1558,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1508 | catch (Exception e) | 1558 | catch (Exception e) |
1509 | { | 1559 | { |
1510 | m_log.ErrorFormat( | 1560 | m_log.ErrorFormat( |
1511 | "[EVENT MANAGER]: Delegate for TriggerParcelPrimCountAdd failed - continuing. {0} {1}", | 1561 | "[EVENT MANAGER]: Delegate for TriggerParcelPrimCountAdd failed - continuing. {0} {1}", |
1512 | e.Message, e.StackTrace); | 1562 | e.Message, e.StackTrace); |
1513 | } | 1563 | } |
1514 | } | 1564 | } |
@@ -1529,7 +1579,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1529 | catch (Exception e) | 1579 | catch (Exception e) |
1530 | { | 1580 | { |
1531 | m_log.ErrorFormat( | 1581 | m_log.ErrorFormat( |
1532 | "[EVENT MANAGER]: Delegate for TriggerObjectAddedToScene failed - continuing. {0} {1}", | 1582 | "[EVENT MANAGER]: Delegate for TriggerObjectAddedToScene failed - continuing. {0} {1}", |
1533 | e.Message, e.StackTrace); | 1583 | e.Message, e.StackTrace); |
1534 | } | 1584 | } |
1535 | } | 1585 | } |
@@ -1575,7 +1625,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1575 | catch (Exception e) | 1625 | catch (Exception e) |
1576 | { | 1626 | { |
1577 | m_log.ErrorFormat( | 1627 | m_log.ErrorFormat( |
1578 | "[EVENT MANAGER]: Delegate for TriggerObjectBeingRemovedFromScene failed - continuing. {0} {1}", | 1628 | "[EVENT MANAGER]: Delegate for TriggerObjectBeingRemovedFromScene failed - continuing. {0} {1}", |
1579 | e.Message, e.StackTrace); | 1629 | e.Message, e.StackTrace); |
1580 | } | 1630 | } |
1581 | } | 1631 | } |
@@ -1596,7 +1646,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1596 | catch (Exception e) | 1646 | catch (Exception e) |
1597 | { | 1647 | { |
1598 | m_log.ErrorFormat( | 1648 | m_log.ErrorFormat( |
1599 | "[EVENT MANAGER]: Delegate for TriggerObjectAddedToPhysicalScene failed - continuing. {0} {1}", | 1649 | "[EVENT MANAGER]: Delegate for TriggerObjectAddedToPhysicalScene failed - continuing. {0} {1}", |
1600 | e.Message, e.StackTrace); | 1650 | e.Message, e.StackTrace); |
1601 | } | 1651 | } |
1602 | } | 1652 | } |
@@ -1617,7 +1667,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1617 | catch (Exception e) | 1667 | catch (Exception e) |
1618 | { | 1668 | { |
1619 | m_log.ErrorFormat( | 1669 | m_log.ErrorFormat( |
1620 | "[EVENT MANAGER]: Delegate for TriggerObjectRemovedFromPhysicalScene failed - continuing. {0} {1}", | 1670 | "[EVENT MANAGER]: Delegate for TriggerObjectRemovedFromPhysicalScene failed - continuing. {0} {1}", |
1621 | e.Message, e.StackTrace); | 1671 | e.Message, e.StackTrace); |
1622 | } | 1672 | } |
1623 | } | 1673 | } |
@@ -1638,7 +1688,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1638 | catch (Exception e) | 1688 | catch (Exception e) |
1639 | { | 1689 | { |
1640 | m_log.ErrorFormat( | 1690 | m_log.ErrorFormat( |
1641 | "[EVENT MANAGER]: Delegate for TriggerShutdown failed - continuing. {0} {1}", | 1691 | "[EVENT MANAGER]: Delegate for TriggerShutdown failed - continuing. {0} {1}", |
1642 | e.Message, e.StackTrace); | 1692 | e.Message, e.StackTrace); |
1643 | } | 1693 | } |
1644 | } | 1694 | } |
@@ -1659,7 +1709,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1659 | catch (Exception e) | 1709 | catch (Exception e) |
1660 | { | 1710 | { |
1661 | m_log.ErrorFormat( | 1711 | m_log.ErrorFormat( |
1662 | "[EVENT MANAGER]: Delegate for TriggerObjectGrab failed - continuing. {0} {1}", | 1712 | "[EVENT MANAGER]: Delegate for TriggerObjectGrab failed - continuing. {0} {1}", |
1663 | e.Message, e.StackTrace); | 1713 | e.Message, e.StackTrace); |
1664 | } | 1714 | } |
1665 | } | 1715 | } |
@@ -1680,7 +1730,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1680 | catch (Exception e) | 1730 | catch (Exception e) |
1681 | { | 1731 | { |
1682 | m_log.ErrorFormat( | 1732 | m_log.ErrorFormat( |
1683 | "[EVENT MANAGER]: Delegate for TriggerObjectGrabbing failed - continuing. {0} {1}", | 1733 | "[EVENT MANAGER]: Delegate for TriggerObjectGrabbing failed - continuing. {0} {1}", |
1684 | e.Message, e.StackTrace); | 1734 | e.Message, e.StackTrace); |
1685 | } | 1735 | } |
1686 | } | 1736 | } |
@@ -1701,7 +1751,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1701 | catch (Exception e) | 1751 | catch (Exception e) |
1702 | { | 1752 | { |
1703 | m_log.ErrorFormat( | 1753 | m_log.ErrorFormat( |
1704 | "[EVENT MANAGER]: Delegate for TriggerObjectDeGrab failed - continuing. {0} {1}", | 1754 | "[EVENT MANAGER]: Delegate for TriggerObjectDeGrab failed - continuing. {0} {1}", |
1705 | e.Message, e.StackTrace); | 1755 | e.Message, e.StackTrace); |
1706 | } | 1756 | } |
1707 | } | 1757 | } |
@@ -1722,7 +1772,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1722 | catch (Exception e) | 1772 | catch (Exception e) |
1723 | { | 1773 | { |
1724 | m_log.ErrorFormat( | 1774 | m_log.ErrorFormat( |
1725 | "[EVENT MANAGER]: Delegate for TriggerScriptReset failed - continuing. {0} {1}", | 1775 | "[EVENT MANAGER]: Delegate for TriggerScriptReset failed - continuing. {0} {1}", |
1726 | e.Message, e.StackTrace); | 1776 | e.Message, e.StackTrace); |
1727 | } | 1777 | } |
1728 | } | 1778 | } |
@@ -1743,7 +1793,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1743 | catch (Exception e) | 1793 | catch (Exception e) |
1744 | { | 1794 | { |
1745 | m_log.ErrorFormat( | 1795 | m_log.ErrorFormat( |
1746 | "[EVENT MANAGER]: Delegate for TriggerRezScript failed - continuing. {0} {1}", | 1796 | "[EVENT MANAGER]: Delegate for TriggerRezScript failed - continuing. {0} {1}", |
1747 | e.Message, e.StackTrace); | 1797 | e.Message, e.StackTrace); |
1748 | } | 1798 | } |
1749 | } | 1799 | } |
@@ -1764,7 +1814,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1764 | catch (Exception e) | 1814 | catch (Exception e) |
1765 | { | 1815 | { |
1766 | m_log.ErrorFormat( | 1816 | m_log.ErrorFormat( |
1767 | "[EVENT MANAGER]: Delegate for TriggerStartScript failed - continuing. {0} {1}", | 1817 | "[EVENT MANAGER]: Delegate for TriggerStartScript failed - continuing. {0} {1}", |
1768 | e.Message, e.StackTrace); | 1818 | e.Message, e.StackTrace); |
1769 | } | 1819 | } |
1770 | } | 1820 | } |
@@ -1785,7 +1835,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1785 | catch (Exception e) | 1835 | catch (Exception e) |
1786 | { | 1836 | { |
1787 | m_log.ErrorFormat( | 1837 | m_log.ErrorFormat( |
1788 | "[EVENT MANAGER]: Delegate for TriggerStopScript failed - continuing. {0} {1}", | 1838 | "[EVENT MANAGER]: Delegate for TriggerStopScript failed - continuing. {0} {1}", |
1789 | e.Message, e.StackTrace); | 1839 | e.Message, e.StackTrace); |
1790 | } | 1840 | } |
1791 | } | 1841 | } |
@@ -1806,8 +1856,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1806 | catch (Exception e) | 1856 | catch (Exception e) |
1807 | { | 1857 | { |
1808 | m_log.ErrorFormat( | 1858 | m_log.ErrorFormat( |
1809 | "[EVENT MANAGER]: Delegate for TriggerRemoveScript failed - continuing. {0} {1}", | 1859 | "[EVENT MANAGER]: Delegate for TriggerRemoveScript failed - continuing. {0} {1}", |
1810 | e.Message, e.StackTrace); | 1860 | e.Message, e.StackTrace); |
1861 | m_log.ErrorFormat(Environment.StackTrace); | ||
1811 | } | 1862 | } |
1812 | } | 1863 | } |
1813 | } | 1864 | } |
@@ -1816,7 +1867,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1816 | public bool TriggerGroupMove(UUID groupID, Vector3 delta) | 1867 | public bool TriggerGroupMove(UUID groupID, Vector3 delta) |
1817 | { | 1868 | { |
1818 | bool result = true; | 1869 | bool result = true; |
1819 | 1870 | ||
1820 | SceneGroupMoved handlerSceneGroupMove = OnSceneGroupMove; | 1871 | SceneGroupMoved handlerSceneGroupMove = OnSceneGroupMove; |
1821 | if (handlerSceneGroupMove != null) | 1872 | if (handlerSceneGroupMove != null) |
1822 | { | 1873 | { |
@@ -1830,19 +1881,19 @@ namespace OpenSim.Region.Framework.Scenes | |||
1830 | catch (Exception e) | 1881 | catch (Exception e) |
1831 | { | 1882 | { |
1832 | m_log.ErrorFormat( | 1883 | m_log.ErrorFormat( |
1833 | "[EVENT MANAGER]: Delegate for TriggerOnAttach failed - continuing. {0} {1}", | 1884 | "[EVENT MANAGER]: Delegate for TriggerGroupMove failed - continuing. {0} {1}", |
1834 | e.Message, e.StackTrace); | 1885 | e.Message, e.StackTrace); |
1835 | } | 1886 | } |
1836 | } | 1887 | } |
1837 | } | 1888 | } |
1838 | 1889 | ||
1839 | return result; | 1890 | return result; |
1840 | } | 1891 | } |
1841 | 1892 | ||
1842 | public bool TriggerGroupSpinStart(UUID groupID) | 1893 | public bool TriggerGroupSpinStart(UUID groupID) |
1843 | { | 1894 | { |
1844 | bool result = true; | 1895 | bool result = true; |
1845 | 1896 | ||
1846 | SceneGroupSpinStarted handlerSceneGroupSpinStarted = OnSceneGroupSpinStart; | 1897 | SceneGroupSpinStarted handlerSceneGroupSpinStarted = OnSceneGroupSpinStart; |
1847 | if (handlerSceneGroupSpinStarted != null) | 1898 | if (handlerSceneGroupSpinStarted != null) |
1848 | { | 1899 | { |
@@ -1856,19 +1907,19 @@ namespace OpenSim.Region.Framework.Scenes | |||
1856 | catch (Exception e) | 1907 | catch (Exception e) |
1857 | { | 1908 | { |
1858 | m_log.ErrorFormat( | 1909 | m_log.ErrorFormat( |
1859 | "[EVENT MANAGER]: Delegate for TriggerGroupSpinStart failed - continuing. {0} {1}", | 1910 | "[EVENT MANAGER]: Delegate for TriggerGroupSpinStart failed - continuing. {0} {1}", |
1860 | e.Message, e.StackTrace); | 1911 | e.Message, e.StackTrace); |
1861 | } | 1912 | } |
1862 | } | 1913 | } |
1863 | } | 1914 | } |
1864 | 1915 | ||
1865 | return result; | 1916 | return result; |
1866 | } | 1917 | } |
1867 | 1918 | ||
1868 | public bool TriggerGroupSpin(UUID groupID, Quaternion rotation) | 1919 | public bool TriggerGroupSpin(UUID groupID, Quaternion rotation) |
1869 | { | 1920 | { |
1870 | bool result = true; | 1921 | bool result = true; |
1871 | 1922 | ||
1872 | SceneGroupSpun handlerSceneGroupSpin = OnSceneGroupSpin; | 1923 | SceneGroupSpun handlerSceneGroupSpin = OnSceneGroupSpin; |
1873 | if (handlerSceneGroupSpin != null) | 1924 | if (handlerSceneGroupSpin != null) |
1874 | { | 1925 | { |
@@ -1882,12 +1933,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
1882 | catch (Exception e) | 1933 | catch (Exception e) |
1883 | { | 1934 | { |
1884 | m_log.ErrorFormat( | 1935 | m_log.ErrorFormat( |
1885 | "[EVENT MANAGER]: Delegate for TriggerGroupSpin failed - continuing. {0} {1}", | 1936 | "[EVENT MANAGER]: Delegate for TriggerGroupSpin failed - continuing. {0} {1}", |
1886 | e.Message, e.StackTrace); | 1937 | e.Message, e.StackTrace); |
1887 | } | 1938 | } |
1888 | } | 1939 | } |
1889 | } | 1940 | } |
1890 | 1941 | ||
1891 | return result; | 1942 | return result; |
1892 | } | 1943 | } |
1893 | 1944 | ||
@@ -1905,7 +1956,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1905 | catch (Exception e) | 1956 | catch (Exception e) |
1906 | { | 1957 | { |
1907 | m_log.ErrorFormat( | 1958 | m_log.ErrorFormat( |
1908 | "[EVENT MANAGER]: Delegate for TriggerGroupGrab failed - continuing. {0} {1}", | 1959 | "[EVENT MANAGER]: Delegate for TriggerGroupGrab failed - continuing. {0} {1}", |
1909 | e.Message, e.StackTrace); | 1960 | e.Message, e.StackTrace); |
1910 | } | 1961 | } |
1911 | } | 1962 | } |
@@ -1926,7 +1977,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1926 | catch (Exception e) | 1977 | catch (Exception e) |
1927 | { | 1978 | { |
1928 | m_log.ErrorFormat( | 1979 | m_log.ErrorFormat( |
1929 | "[EVENT MANAGER]: Delegate for TriggerLandObjectAdded failed - continuing. {0} {1}", | 1980 | "[EVENT MANAGER]: Delegate for TriggerLandObjectAdded failed - continuing. {0} {1}", |
1930 | e.Message, e.StackTrace); | 1981 | e.Message, e.StackTrace); |
1931 | } | 1982 | } |
1932 | } | 1983 | } |
@@ -1947,7 +1998,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1947 | catch (Exception e) | 1998 | catch (Exception e) |
1948 | { | 1999 | { |
1949 | m_log.ErrorFormat( | 2000 | m_log.ErrorFormat( |
1950 | "[EVENT MANAGER]: Delegate for TriggerLandObjectRemoved failed - continuing. {0} {1}", | 2001 | "[EVENT MANAGER]: Delegate for TriggerLandObjectRemoved failed - continuing. {0} {1}", |
1951 | e.Message, e.StackTrace); | 2002 | e.Message, e.StackTrace); |
1952 | } | 2003 | } |
1953 | } | 2004 | } |
@@ -1973,7 +2024,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1973 | catch (Exception e) | 2024 | catch (Exception e) |
1974 | { | 2025 | { |
1975 | m_log.ErrorFormat( | 2026 | m_log.ErrorFormat( |
1976 | "[EVENT MANAGER]: Delegate for TriggerAvatarEnteringNewParcel failed - continuing. {0} {1}", | 2027 | "[EVENT MANAGER]: Delegate for TriggerAvatarEnteringNewParcel failed - continuing. {0} {1}", |
1977 | e.Message, e.StackTrace); | 2028 | e.Message, e.StackTrace); |
1978 | } | 2029 | } |
1979 | } | 2030 | } |
@@ -1994,7 +2045,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1994 | catch (Exception e) | 2045 | catch (Exception e) |
1995 | { | 2046 | { |
1996 | m_log.ErrorFormat( | 2047 | m_log.ErrorFormat( |
1997 | "[EVENT MANAGER]: Delegate for TriggerAvatarAppearanceChanged failed - continuing. {0} {1}", | 2048 | "[EVENT MANAGER]: Delegate for TriggerAvatarAppearanceChanged failed - continuing. {0} {1}", |
1998 | e.Message, e.StackTrace); | 2049 | e.Message, e.StackTrace); |
1999 | } | 2050 | } |
2000 | } | 2051 | } |
@@ -2036,7 +2087,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2036 | catch (Exception e) | 2087 | catch (Exception e) |
2037 | { | 2088 | { |
2038 | m_log.ErrorFormat( | 2089 | m_log.ErrorFormat( |
2039 | "[EVENT MANAGER]: Delegate for TriggerIncomingInstantMessage failed - continuing. {0} {1}", | 2090 | "[EVENT MANAGER]: Delegate for TriggerIncomingInstantMessage failed - continuing. {0} {1}", |
2040 | e.Message, e.StackTrace); | 2091 | e.Message, e.StackTrace); |
2041 | } | 2092 | } |
2042 | } | 2093 | } |
@@ -2057,7 +2108,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2057 | catch (Exception e) | 2108 | catch (Exception e) |
2058 | { | 2109 | { |
2059 | m_log.ErrorFormat( | 2110 | m_log.ErrorFormat( |
2060 | "[EVENT MANAGER]: Delegate for TriggerOnAttach failed - continuing. {0} {1}", | 2111 | "[EVENT MANAGER]: Delegate for TriggerOnAttach failed - continuing. {0} {1}", |
2061 | e.Message, e.StackTrace); | 2112 | e.Message, e.StackTrace); |
2062 | } | 2113 | } |
2063 | } | 2114 | } |
@@ -2073,12 +2124,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
2073 | { | 2124 | { |
2074 | try | 2125 | try |
2075 | { | 2126 | { |
2127 | // m_log.ErrorFormat("[EVENT MANAGER]: TriggerClientClosed: {0}", d.Target.ToString()); | ||
2076 | d(ClientID, scene); | 2128 | d(ClientID, scene); |
2129 | // m_log.ErrorFormat("[EVENT MANAGER]: TriggerClientClosed done "); | ||
2130 | |||
2077 | } | 2131 | } |
2078 | catch (Exception e) | 2132 | catch (Exception e) |
2079 | { | 2133 | { |
2080 | m_log.ErrorFormat( | 2134 | m_log.ErrorFormat( |
2081 | "[EVENT MANAGER]: Delegate for TriggerClientClosed failed - continuing. {0} {1}", | 2135 | "[EVENT MANAGER]: Delegate for TriggerClientClosed failed - continuing. {0} {1}", |
2082 | e.Message, e.StackTrace); | 2136 | e.Message, e.StackTrace); |
2083 | } | 2137 | } |
2084 | } | 2138 | } |
@@ -2099,7 +2153,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2099 | catch (Exception e) | 2153 | catch (Exception e) |
2100 | { | 2154 | { |
2101 | m_log.ErrorFormat( | 2155 | m_log.ErrorFormat( |
2102 | "[EVENT MANAGER]: Delegate for TriggerOnMakeChildAgent failed - continuing. {0} {1}", | 2156 | "[EVENT MANAGER]: Delegate for TriggerOnMakeChildAgent failed - continuing. {0} {1}", |
2103 | e.Message, e.StackTrace); | 2157 | e.Message, e.StackTrace); |
2104 | } | 2158 | } |
2105 | } | 2159 | } |
@@ -2138,7 +2192,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2138 | catch (Exception e) | 2192 | catch (Exception e) |
2139 | { | 2193 | { |
2140 | m_log.ErrorFormat( | 2194 | m_log.ErrorFormat( |
2141 | "[EVENT MANAGER]: Delegate for TriggerOnMakeRootAgent failed - continuing. {0} {1}", | 2195 | "[EVENT MANAGER]: Delegate for TriggerOnMakeRootAgent failed - continuing. {0} {1}", |
2142 | e.Message, e.StackTrace); | 2196 | e.Message, e.StackTrace); |
2143 | } | 2197 | } |
2144 | } | 2198 | } |
@@ -2159,7 +2213,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2159 | catch (Exception e) | 2213 | catch (Exception e) |
2160 | { | 2214 | { |
2161 | m_log.ErrorFormat( | 2215 | m_log.ErrorFormat( |
2162 | "[EVENT MANAGER]: Delegate for TriggerOnIncomingSceneObject failed - continuing. {0} {1}", | 2216 | "[EVENT MANAGER]: Delegate for TriggerOnIncomingSceneObject failed - continuing. {0} {1}", |
2163 | e.Message, e.StackTrace); | 2217 | e.Message, e.StackTrace); |
2164 | } | 2218 | } |
2165 | } | 2219 | } |
@@ -2180,7 +2234,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2180 | catch (Exception e) | 2234 | catch (Exception e) |
2181 | { | 2235 | { |
2182 | m_log.ErrorFormat( | 2236 | m_log.ErrorFormat( |
2183 | "[EVENT MANAGER]: Delegate for TriggerOnRegisterCaps failed - continuing. {0} {1}", | 2237 | "[EVENT MANAGER]: Delegate for TriggerOnRegisterCaps failed - continuing. {0} {1}", |
2184 | e.Message, e.StackTrace); | 2238 | e.Message, e.StackTrace); |
2185 | } | 2239 | } |
2186 | } | 2240 | } |
@@ -2201,14 +2255,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
2201 | catch (Exception e) | 2255 | catch (Exception e) |
2202 | { | 2256 | { |
2203 | m_log.ErrorFormat( | 2257 | m_log.ErrorFormat( |
2204 | "[EVENT MANAGER]: Delegate for TriggerOnDeregisterCaps failed - continuing. {0} {1}", | 2258 | "[EVENT MANAGER]: Delegate for TriggerOnDeregisterCaps failed - continuing. {0} {1}", |
2205 | e.Message, e.StackTrace); | 2259 | e.Message, e.StackTrace); |
2206 | } | 2260 | } |
2207 | } | 2261 | } |
2208 | } | 2262 | } |
2209 | } | 2263 | } |
2210 | 2264 | ||
2211 | public void TriggerOnNewInventoryItemUploadComplete(UUID agentID, AssetType type, UUID AssetID, String AssetName, int userlevel) | 2265 | public void TriggerOnNewInventoryItemUploadComplete(InventoryItemBase item, int userlevel) |
2212 | { | 2266 | { |
2213 | NewInventoryItemUploadComplete handlerNewInventoryItemUpdateComplete = OnNewInventoryItemUploadComplete; | 2267 | NewInventoryItemUploadComplete handlerNewInventoryItemUpdateComplete = OnNewInventoryItemUploadComplete; |
2214 | if (handlerNewInventoryItemUpdateComplete != null) | 2268 | if (handlerNewInventoryItemUpdateComplete != null) |
@@ -2217,12 +2271,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
2217 | { | 2271 | { |
2218 | try | 2272 | try |
2219 | { | 2273 | { |
2220 | d(agentID, type, AssetID, AssetName, userlevel); | 2274 | d(item, userlevel); |
2221 | } | 2275 | } |
2222 | catch (Exception e) | 2276 | catch (Exception e) |
2223 | { | 2277 | { |
2224 | m_log.ErrorFormat( | 2278 | m_log.ErrorFormat( |
2225 | "[EVENT MANAGER]: Delegate for TriggerOnNewInventoryItemUploadComplete failed - continuing. {0} {1}", | 2279 | "[EVENT MANAGER]: Delegate for TriggerOnNewInventoryItemUploadComplete failed - continuing. {0} {1}", |
2226 | e.Message, e.StackTrace); | 2280 | e.Message, e.StackTrace); |
2227 | } | 2281 | } |
2228 | } | 2282 | } |
@@ -2243,7 +2297,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2243 | catch (Exception e) | 2297 | catch (Exception e) |
2244 | { | 2298 | { |
2245 | m_log.ErrorFormat( | 2299 | m_log.ErrorFormat( |
2246 | "[EVENT MANAGER]: Delegate for TriggerLandBuy failed - continuing. {0} {1}", | 2300 | "[EVENT MANAGER]: Delegate for TriggerLandBuy failed - continuing. {0} {1}", |
2247 | e.Message, e.StackTrace); | 2301 | e.Message, e.StackTrace); |
2248 | } | 2302 | } |
2249 | } | 2303 | } |
@@ -2264,7 +2318,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2264 | catch (Exception e) | 2318 | catch (Exception e) |
2265 | { | 2319 | { |
2266 | m_log.ErrorFormat( | 2320 | m_log.ErrorFormat( |
2267 | "[EVENT MANAGER]: Delegate for TriggerValidateLandBuy failed - continuing. {0} {1}", | 2321 | "[EVENT MANAGER]: Delegate for TriggerValidateLandBuy failed - continuing. {0} {1}", |
2268 | e.Message, e.StackTrace); | 2322 | e.Message, e.StackTrace); |
2269 | } | 2323 | } |
2270 | } | 2324 | } |
@@ -2285,7 +2339,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2285 | catch (Exception e) | 2339 | catch (Exception e) |
2286 | { | 2340 | { |
2287 | m_log.ErrorFormat( | 2341 | m_log.ErrorFormat( |
2288 | "[EVENT MANAGER]: Delegate for TriggerAtTargetEvent failed - continuing. {0} {1}", | 2342 | "[EVENT MANAGER]: Delegate for TriggerAtTargetEvent failed - continuing. {0} {1}", |
2289 | e.Message, e.StackTrace); | 2343 | e.Message, e.StackTrace); |
2290 | } | 2344 | } |
2291 | } | 2345 | } |
@@ -2306,7 +2360,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2306 | catch (Exception e) | 2360 | catch (Exception e) |
2307 | { | 2361 | { |
2308 | m_log.ErrorFormat( | 2362 | m_log.ErrorFormat( |
2309 | "[EVENT MANAGER]: Delegate for TriggerNotAtTargetEvent failed - continuing. {0} {1}", | 2363 | "[EVENT MANAGER]: Delegate for TriggerNotAtTargetEvent failed - continuing. {0} {1}", |
2310 | e.Message, e.StackTrace); | 2364 | e.Message, e.StackTrace); |
2311 | } | 2365 | } |
2312 | } | 2366 | } |
@@ -2327,7 +2381,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2327 | catch (Exception e) | 2381 | catch (Exception e) |
2328 | { | 2382 | { |
2329 | m_log.ErrorFormat( | 2383 | m_log.ErrorFormat( |
2330 | "[EVENT MANAGER]: Delegate for TriggerAtRotTargetEvent failed - continuing. {0} {1}", | 2384 | "[EVENT MANAGER]: Delegate for TriggerAtRotTargetEvent failed - continuing. {0} {1}", |
2331 | e.Message, e.StackTrace); | 2385 | e.Message, e.StackTrace); |
2332 | } | 2386 | } |
2333 | } | 2387 | } |
@@ -2348,7 +2402,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2348 | catch (Exception e) | 2402 | catch (Exception e) |
2349 | { | 2403 | { |
2350 | m_log.ErrorFormat( | 2404 | m_log.ErrorFormat( |
2351 | "[EVENT MANAGER]: Delegate for TriggerNotAtRotTargetEvent failed - continuing. {0} {1}", | 2405 | "[EVENT MANAGER]: Delegate for TriggerNotAtRotTargetEvent failed - continuing. {0} {1}", |
2352 | e.Message, e.StackTrace); | 2406 | e.Message, e.StackTrace); |
2353 | } | 2407 | } |
2354 | } | 2408 | } |
@@ -2417,7 +2471,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2417 | catch (Exception e) | 2471 | catch (Exception e) |
2418 | { | 2472 | { |
2419 | m_log.ErrorFormat( | 2473 | m_log.ErrorFormat( |
2420 | "[EVENT MANAGER]: Delegate for TriggerRequestChangeWaterHeight failed - continuing. {0} {1}", | 2474 | "[EVENT MANAGER]: Delegate for TriggerRequestChangeWaterHeight failed - continuing. {0} {1}", |
2421 | e.Message, e.StackTrace); | 2475 | e.Message, e.StackTrace); |
2422 | } | 2476 | } |
2423 | } | 2477 | } |
@@ -2438,7 +2492,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2438 | catch (Exception e) | 2492 | catch (Exception e) |
2439 | { | 2493 | { |
2440 | m_log.ErrorFormat( | 2494 | m_log.ErrorFormat( |
2441 | "[EVENT MANAGER]: Delegate for TriggerAvatarKill failed - continuing. {0} {1}", | 2495 | "[EVENT MANAGER]: Delegate for TriggerAvatarKill failed - continuing. {0} {1}", |
2442 | e.Message, e.StackTrace); | 2496 | e.Message, e.StackTrace); |
2443 | } | 2497 | } |
2444 | } | 2498 | } |
@@ -2459,7 +2513,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2459 | catch (Exception e) | 2513 | catch (Exception e) |
2460 | { | 2514 | { |
2461 | m_log.ErrorFormat( | 2515 | m_log.ErrorFormat( |
2462 | "[EVENT MANAGER]: Delegate for TriggerSignificantClientMovement failed - continuing. {0} {1}", | 2516 | "[EVENT MANAGER]: Delegate for TriggerSignificantClientMovement failed - continuing. {0} {1}", |
2463 | e.Message, e.StackTrace); | 2517 | e.Message, e.StackTrace); |
2464 | } | 2518 | } |
2465 | } | 2519 | } |
@@ -2480,7 +2534,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2480 | catch (Exception e) | 2534 | catch (Exception e) |
2481 | { | 2535 | { |
2482 | m_log.ErrorFormat( | 2536 | m_log.ErrorFormat( |
2483 | "[EVENT MANAGER]: Delegate for TriggerOnChatFromWorld failed - continuing. {0} {1}", | 2537 | "[EVENT MANAGER]: Delegate for TriggerOnChatFromWorld failed - continuing. {0} {1}", |
2484 | e.Message, e.StackTrace); | 2538 | e.Message, e.StackTrace); |
2485 | } | 2539 | } |
2486 | } | 2540 | } |
@@ -2501,16 +2555,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
2501 | catch (Exception e) | 2555 | catch (Exception e) |
2502 | { | 2556 | { |
2503 | m_log.ErrorFormat( | 2557 | m_log.ErrorFormat( |
2504 | "[EVENT MANAGER]: Delegate for TriggerOnChatFromClient failed - continuing. {0} {1}", | 2558 | "[EVENT MANAGER]: Delegate for TriggerOnChatFromClient failed - continuing. {0} {1}", |
2505 | e.Message, e.StackTrace); | 2559 | e.Message, e.StackTrace); |
2506 | } | 2560 | } |
2507 | } | 2561 | } |
2508 | } | 2562 | } |
2509 | } | 2563 | } |
2510 | 2564 | ||
2511 | public void TriggerOnChatToClients( | 2565 | public void TriggerOnChatToClients( |
2512 | UUID senderID, HashSet<UUID> receiverIDs, | 2566 | UUID senderID, HashSet<UUID> receiverIDs, |
2513 | string message, ChatTypeEnum type, Vector3 fromPos, string fromName, | 2567 | string message, ChatTypeEnum type, Vector3 fromPos, string fromName, |
2514 | ChatSourceType src, ChatAudibleLevel level) | 2568 | ChatSourceType src, ChatAudibleLevel level) |
2515 | { | 2569 | { |
2516 | ChatToClientsEvent handler = OnChatToClients; | 2570 | ChatToClientsEvent handler = OnChatToClients; |
@@ -2525,7 +2579,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2525 | catch (Exception e) | 2579 | catch (Exception e) |
2526 | { | 2580 | { |
2527 | m_log.ErrorFormat( | 2581 | m_log.ErrorFormat( |
2528 | "[EVENT MANAGER]: Delegate for TriggerOnChatToClients failed - continuing. {0} {1}", | 2582 | "[EVENT MANAGER]: Delegate for TriggerOnChatToClients failed - continuing. {0} {1}", |
2529 | e.Message, e.StackTrace); | 2583 | e.Message, e.StackTrace); |
2530 | } | 2584 | } |
2531 | } | 2585 | } |
@@ -2546,7 +2600,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2546 | catch (Exception e) | 2600 | catch (Exception e) |
2547 | { | 2601 | { |
2548 | m_log.ErrorFormat( | 2602 | m_log.ErrorFormat( |
2549 | "[EVENT MANAGER]: Delegate for TriggerOnChatBroadcast failed - continuing. {0} {1}", | 2603 | "[EVENT MANAGER]: Delegate for TriggerOnChatBroadcast failed - continuing. {0} {1}", |
2550 | e.Message, e.StackTrace); | 2604 | e.Message, e.StackTrace); |
2551 | } | 2605 | } |
2552 | } | 2606 | } |
@@ -2567,7 +2621,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2567 | catch (Exception e) | 2621 | catch (Exception e) |
2568 | { | 2622 | { |
2569 | m_log.ErrorFormat( | 2623 | m_log.ErrorFormat( |
2570 | "[EVENT MANAGER]: Delegate for TriggerControlEvent failed - continuing. {0} {1}", | 2624 | "[EVENT MANAGER]: Delegate for TriggerControlEvent failed - continuing. {0} {1}", |
2571 | e.Message, e.StackTrace); | 2625 | e.Message, e.StackTrace); |
2572 | } | 2626 | } |
2573 | } | 2627 | } |
@@ -2588,7 +2642,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2588 | catch (Exception e) | 2642 | catch (Exception e) |
2589 | { | 2643 | { |
2590 | m_log.ErrorFormat( | 2644 | m_log.ErrorFormat( |
2591 | "[EVENT MANAGER]: Delegate for TriggerNoticeNoLandDataFromStorage failed - continuing. {0} {1}", | 2645 | "[EVENT MANAGER]: Delegate for TriggerNoticeNoLandDataFromStorage failed - continuing. {0} {1}", |
2592 | e.Message, e.StackTrace); | 2646 | e.Message, e.StackTrace); |
2593 | } | 2647 | } |
2594 | } | 2648 | } |
@@ -2609,7 +2663,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2609 | catch (Exception e) | 2663 | catch (Exception e) |
2610 | { | 2664 | { |
2611 | m_log.ErrorFormat( | 2665 | m_log.ErrorFormat( |
2612 | "[EVENT MANAGER]: Delegate for TriggerIncomingLandDataFromStorage failed - continuing. {0} {1}", | 2666 | "[EVENT MANAGER]: Delegate for TriggerIncomingLandDataFromStorage failed - continuing. {0} {1}", |
2613 | e.Message, e.StackTrace); | 2667 | e.Message, e.StackTrace); |
2614 | } | 2668 | } |
2615 | } | 2669 | } |
@@ -2630,7 +2684,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2630 | catch (Exception e) | 2684 | catch (Exception e) |
2631 | { | 2685 | { |
2632 | m_log.ErrorFormat( | 2686 | m_log.ErrorFormat( |
2633 | "[EVENT MANAGER]: Delegate for TriggerSetAllowForcefulBan failed - continuing. {0} {1}", | 2687 | "[EVENT MANAGER]: Delegate for TriggerSetAllowForcefulBan failed - continuing. {0} {1}", |
2634 | e.Message, e.StackTrace); | 2688 | e.Message, e.StackTrace); |
2635 | } | 2689 | } |
2636 | } | 2690 | } |
@@ -2651,7 +2705,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2651 | catch (Exception e) | 2705 | catch (Exception e) |
2652 | { | 2706 | { |
2653 | m_log.ErrorFormat( | 2707 | m_log.ErrorFormat( |
2654 | "[EVENT MANAGER]: Delegate for TriggerRequestParcelPrimCountUpdate failed - continuing. {0} {1}", | 2708 | "[EVENT MANAGER]: Delegate for TriggerRequestParcelPrimCountUpdate failed - continuing. {0} {1}", |
2655 | e.Message, e.StackTrace); | 2709 | e.Message, e.StackTrace); |
2656 | } | 2710 | } |
2657 | } | 2711 | } |
@@ -2672,7 +2726,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2672 | catch (Exception e) | 2726 | catch (Exception e) |
2673 | { | 2727 | { |
2674 | m_log.ErrorFormat( | 2728 | m_log.ErrorFormat( |
2675 | "[EVENT MANAGER]: Delegate for TriggerParcelPrimCountTainted failed - continuing. {0} {1}", | 2729 | "[EVENT MANAGER]: Delegate for TriggerParcelPrimCountTainted failed - continuing. {0} {1}", |
2676 | e.Message, e.StackTrace); | 2730 | e.Message, e.StackTrace); |
2677 | } | 2731 | } |
2678 | } | 2732 | } |
@@ -2712,7 +2766,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2712 | catch (Exception e) | 2766 | catch (Exception e) |
2713 | { | 2767 | { |
2714 | m_log.ErrorFormat( | 2768 | m_log.ErrorFormat( |
2715 | "[EVENT MANAGER]: Delegate for TriggerEstateToolsSunUpdate failed - continuing. {0} {1}", | 2769 | "[EVENT MANAGER]: Delegate for TriggerEstateToolsSunUpdate failed - continuing. {0} {1}", |
2716 | e.Message, e.StackTrace); | 2770 | e.Message, e.StackTrace); |
2717 | } | 2771 | } |
2718 | } | 2772 | } |
@@ -2733,12 +2787,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
2733 | catch (Exception e) | 2787 | catch (Exception e) |
2734 | { | 2788 | { |
2735 | m_log.ErrorFormat( | 2789 | m_log.ErrorFormat( |
2736 | "[EVENT MANAGER]: Delegate for TriggerOnAttach failed - continuing. {0} {1}", | 2790 | "[EVENT MANAGER]: Delegate for TriggerOnAttach failed - continuing. {0} {1}", |
2737 | e.Message, e.StackTrace); | 2791 | e.Message, e.StackTrace); |
2738 | } | 2792 | } |
2739 | } | 2793 | } |
2740 | } | 2794 | } |
2741 | 2795 | ||
2742 | return 6; | 2796 | return 6; |
2743 | } | 2797 | } |
2744 | 2798 | ||
@@ -2756,13 +2810,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
2756 | catch (Exception e) | 2810 | catch (Exception e) |
2757 | { | 2811 | { |
2758 | m_log.ErrorFormat( | 2812 | m_log.ErrorFormat( |
2759 | "[EVENT MANAGER]: Delegate for TriggerOarFileLoaded failed - continuing. {0} {1}", | 2813 | "[EVENT MANAGER]: Delegate for TriggerOarFileLoaded failed - continuing. {0} {1}", |
2760 | e.Message, e.StackTrace); | 2814 | e.Message, e.StackTrace); |
2761 | } | 2815 | } |
2762 | } | 2816 | } |
2763 | } | 2817 | } |
2764 | } | 2818 | } |
2765 | 2819 | ||
2766 | public void TriggerOarFileSaved(Guid requestId, string message) | 2820 | public void TriggerOarFileSaved(Guid requestId, string message) |
2767 | { | 2821 | { |
2768 | OarFileSaved handlerOarFileSaved = OnOarFileSaved; | 2822 | OarFileSaved handlerOarFileSaved = OnOarFileSaved; |
@@ -2777,7 +2831,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2777 | catch (Exception e) | 2831 | catch (Exception e) |
2778 | { | 2832 | { |
2779 | m_log.ErrorFormat( | 2833 | m_log.ErrorFormat( |
2780 | "[EVENT MANAGER]: Delegate for TriggerOarFileSaved failed - continuing. {0} {1}", | 2834 | "[EVENT MANAGER]: Delegate for TriggerOarFileSaved failed - continuing. {0} {1}", |
2781 | e.Message, e.StackTrace); | 2835 | e.Message, e.StackTrace); |
2782 | } | 2836 | } |
2783 | } | 2837 | } |
@@ -2798,7 +2852,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2798 | catch (Exception e) | 2852 | catch (Exception e) |
2799 | { | 2853 | { |
2800 | m_log.ErrorFormat( | 2854 | m_log.ErrorFormat( |
2801 | "[EVENT MANAGER]: Delegate for TriggerEmptyScriptCompileQueue failed - continuing. {0} {1}", | 2855 | "[EVENT MANAGER]: Delegate for TriggerEmptyScriptCompileQueue failed - continuing. {0} {1}", |
2802 | e.Message, e.StackTrace); | 2856 | e.Message, e.StackTrace); |
2803 | } | 2857 | } |
2804 | } | 2858 | } |
@@ -2819,7 +2873,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2819 | catch (Exception e) | 2873 | catch (Exception e) |
2820 | { | 2874 | { |
2821 | m_log.ErrorFormat( | 2875 | m_log.ErrorFormat( |
2822 | "[EVENT MANAGER]: Delegate for TriggerScriptCollidingStart failed - continuing. {0} {1}", | 2876 | "[EVENT MANAGER]: Delegate for TriggerScriptCollidingStart failed - continuing. {0} {1}", |
2823 | e.Message, e.StackTrace); | 2877 | e.Message, e.StackTrace); |
2824 | } | 2878 | } |
2825 | } | 2879 | } |
@@ -2840,7 +2894,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2840 | catch (Exception e) | 2894 | catch (Exception e) |
2841 | { | 2895 | { |
2842 | m_log.ErrorFormat( | 2896 | m_log.ErrorFormat( |
2843 | "[EVENT MANAGER]: Delegate for TriggerScriptColliding failed - continuing. {0} {1}", | 2897 | "[EVENT MANAGER]: Delegate for TriggerScriptColliding failed - continuing. {0} {1}", |
2844 | e.Message, e.StackTrace); | 2898 | e.Message, e.StackTrace); |
2845 | } | 2899 | } |
2846 | } | 2900 | } |
@@ -2861,7 +2915,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2861 | catch (Exception e) | 2915 | catch (Exception e) |
2862 | { | 2916 | { |
2863 | m_log.ErrorFormat( | 2917 | m_log.ErrorFormat( |
2864 | "[EVENT MANAGER]: Delegate for TriggerScriptCollidingEnd failed - continuing. {0} {1}", | 2918 | "[EVENT MANAGER]: Delegate for TriggerScriptCollidingEnd failed - continuing. {0} {1}", |
2865 | e.Message, e.StackTrace); | 2919 | e.Message, e.StackTrace); |
2866 | } | 2920 | } |
2867 | } | 2921 | } |
@@ -2882,7 +2936,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2882 | catch (Exception e) | 2936 | catch (Exception e) |
2883 | { | 2937 | { |
2884 | m_log.ErrorFormat( | 2938 | m_log.ErrorFormat( |
2885 | "[EVENT MANAGER]: Delegate for TriggerScriptLandCollidingStart failed - continuing. {0} {1}", | 2939 | "[EVENT MANAGER]: Delegate for TriggerScriptLandCollidingStart failed - continuing. {0} {1}", |
2886 | e.Message, e.StackTrace); | 2940 | e.Message, e.StackTrace); |
2887 | } | 2941 | } |
2888 | } | 2942 | } |
@@ -2903,7 +2957,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2903 | catch (Exception e) | 2957 | catch (Exception e) |
2904 | { | 2958 | { |
2905 | m_log.ErrorFormat( | 2959 | m_log.ErrorFormat( |
2906 | "[EVENT MANAGER]: Delegate for TriggerScriptLandColliding failed - continuing. {0} {1}", | 2960 | "[EVENT MANAGER]: Delegate for TriggerScriptLandColliding failed - continuing. {0} {1}", |
2907 | e.Message, e.StackTrace); | 2961 | e.Message, e.StackTrace); |
2908 | } | 2962 | } |
2909 | } | 2963 | } |
@@ -2924,7 +2978,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2924 | catch (Exception e) | 2978 | catch (Exception e) |
2925 | { | 2979 | { |
2926 | m_log.ErrorFormat( | 2980 | m_log.ErrorFormat( |
2927 | "[EVENT MANAGER]: Delegate for TriggerScriptLandCollidingEnd failed - continuing. {0} {1}", | 2981 | "[EVENT MANAGER]: Delegate for TriggerScriptLandCollidingEnd failed - continuing. {0} {1}", |
2928 | e.Message, e.StackTrace); | 2982 | e.Message, e.StackTrace); |
2929 | } | 2983 | } |
2930 | } | 2984 | } |
@@ -2945,7 +2999,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2945 | catch (Exception e) | 2999 | catch (Exception e) |
2946 | { | 3000 | { |
2947 | m_log.ErrorFormat( | 3001 | m_log.ErrorFormat( |
2948 | "[EVENT MANAGER]: Delegate for TriggerSetRootAgentScene failed - continuing. {0} {1}", | 3002 | "[EVENT MANAGER]: Delegate for TriggerSetRootAgentScene failed - continuing. {0} {1}", |
2949 | e.Message, e.StackTrace); | 3003 | e.Message, e.StackTrace); |
2950 | } | 3004 | } |
2951 | } | 3005 | } |
@@ -2966,13 +3020,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
2966 | catch (Exception e) | 3020 | catch (Exception e) |
2967 | { | 3021 | { |
2968 | m_log.ErrorFormat( | 3022 | m_log.ErrorFormat( |
2969 | "[EVENT MANAGER]: Delegate for TriggerOnRegionUp failed - continuing. {0} {1}", | 3023 | "[EVENT MANAGER]: Delegate for TriggerOnRegionUp failed - continuing. {0} {1}", |
2970 | e.Message, e.StackTrace); | 3024 | e.Message, e.StackTrace); |
2971 | } | 3025 | } |
2972 | } | 3026 | } |
2973 | } | 3027 | } |
2974 | } | 3028 | } |
2975 | 3029 | ||
2976 | public void TriggerOnSceneObjectLoaded(SceneObjectGroup so) | 3030 | public void TriggerOnSceneObjectLoaded(SceneObjectGroup so) |
2977 | { | 3031 | { |
2978 | SceneObjectDelegate handler = OnSceneObjectLoaded; | 3032 | SceneObjectDelegate handler = OnSceneObjectLoaded; |
@@ -2987,13 +3041,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
2987 | catch (Exception e) | 3041 | catch (Exception e) |
2988 | { | 3042 | { |
2989 | m_log.ErrorFormat( | 3043 | m_log.ErrorFormat( |
2990 | "[EVENT MANAGER]: Delegate for TriggerOnSceneObjectLoaded failed - continuing. {0} {1}", | 3044 | "[EVENT MANAGER]: Delegate for TriggerOnSceneObjectLoaded failed - continuing. {0} {1}", |
2991 | e.Message, e.StackTrace); | 3045 | e.Message, e.StackTrace); |
2992 | } | 3046 | } |
2993 | } | 3047 | } |
2994 | } | 3048 | } |
2995 | } | 3049 | } |
2996 | 3050 | ||
2997 | public void TriggerOnSceneObjectPreSave(SceneObjectGroup persistingSo, SceneObjectGroup originalSo) | 3051 | public void TriggerOnSceneObjectPreSave(SceneObjectGroup persistingSo, SceneObjectGroup originalSo) |
2998 | { | 3052 | { |
2999 | SceneObjectPreSaveDelegate handler = OnSceneObjectPreSave; | 3053 | SceneObjectPreSaveDelegate handler = OnSceneObjectPreSave; |
@@ -3008,13 +3062,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
3008 | catch (Exception e) | 3062 | catch (Exception e) |
3009 | { | 3063 | { |
3010 | m_log.ErrorFormat( | 3064 | m_log.ErrorFormat( |
3011 | "[EVENT MANAGER]: Delegate for TriggerOnSceneObjectPreSave failed - continuing. {0} {1}", | 3065 | "[EVENT MANAGER]: Delegate for TriggerOnSceneObjectPreSave failed - continuing. {0} {1}", |
3012 | e.Message, e.StackTrace); | 3066 | e.Message, e.StackTrace); |
3013 | } | 3067 | } |
3014 | } | 3068 | } |
3015 | } | 3069 | } |
3016 | } | 3070 | } |
3017 | 3071 | ||
3018 | public void TriggerOnSceneObjectPartCopy(SceneObjectPart copy, SceneObjectPart original, bool userExposed) | 3072 | public void TriggerOnSceneObjectPartCopy(SceneObjectPart copy, SceneObjectPart original, bool userExposed) |
3019 | { | 3073 | { |
3020 | SceneObjectPartCopyDelegate handler = OnSceneObjectPartCopy; | 3074 | SceneObjectPartCopyDelegate handler = OnSceneObjectPartCopy; |
@@ -3029,7 +3083,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3029 | catch (Exception e) | 3083 | catch (Exception e) |
3030 | { | 3084 | { |
3031 | m_log.ErrorFormat( | 3085 | m_log.ErrorFormat( |
3032 | "[EVENT MANAGER]: Delegate for TriggerOnSceneObjectPartCopy failed - continuing. {0} {1}", | 3086 | "[EVENT MANAGER]: Delegate for TriggerOnSceneObjectPartCopy failed - continuing. {0} {1}", |
3033 | e.Message, e.StackTrace); | 3087 | e.Message, e.StackTrace); |
3034 | } | 3088 | } |
3035 | } | 3089 | } |
@@ -3050,7 +3104,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3050 | catch (Exception e) | 3104 | catch (Exception e) |
3051 | { | 3105 | { |
3052 | m_log.ErrorFormat( | 3106 | m_log.ErrorFormat( |
3053 | "[EVENT MANAGER]: Delegate for TriggerSceneObjectPartUpdated failed - continuing. {0} {1}", | 3107 | "[EVENT MANAGER]: Delegate for TriggerSceneObjectPartUpdated failed - continuing. {0} {1}", |
3054 | e.Message, e.StackTrace); | 3108 | e.Message, e.StackTrace); |
3055 | } | 3109 | } |
3056 | } | 3110 | } |
@@ -3093,7 +3147,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3093 | catch (Exception e) | 3147 | catch (Exception e) |
3094 | { | 3148 | { |
3095 | m_log.ErrorFormat( | 3149 | m_log.ErrorFormat( |
3096 | "[EVENT MANAGER]: Delegate for TriggerOnSceneObjectPartCopy failed - continuing. {0} {1}", | 3150 | "[EVENT MANAGER]: Delegate for TriggerOnSceneObjectPartCopy failed - continuing. {0} {1}", |
3097 | e.Message, e.StackTrace); | 3151 | e.Message, e.StackTrace); |
3098 | } | 3152 | } |
3099 | } | 3153 | } |
@@ -3107,6 +3161,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3107 | { | 3161 | { |
3108 | foreach (Action<Scene> d in handler.GetInvocationList()) | 3162 | foreach (Action<Scene> d in handler.GetInvocationList()) |
3109 | { | 3163 | { |
3164 | m_log.InfoFormat("[EVENT MANAGER]: TriggerSceneShuttingDown invoke {0}", d.Method.Name.ToString()); | ||
3110 | try | 3165 | try |
3111 | { | 3166 | { |
3112 | d(s); | 3167 | d(s); |
@@ -3114,11 +3169,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
3114 | catch (Exception e) | 3169 | catch (Exception e) |
3115 | { | 3170 | { |
3116 | m_log.ErrorFormat( | 3171 | m_log.ErrorFormat( |
3117 | "[EVENT MANAGER]: Delegate for TriggerSceneShuttingDown failed - continuing. {0} {1}", | 3172 | "[EVENT MANAGER]: Delegate for TriggerSceneShuttingDown failed - continuing. {0} {1}", |
3118 | e.Message, e.StackTrace); | 3173 | e.Message, e.StackTrace); |
3119 | } | 3174 | } |
3120 | } | 3175 | } |
3121 | } | 3176 | } |
3177 | m_log.Info("[EVENT MANAGER]: TriggerSceneShuttingDown done"); | ||
3122 | } | 3178 | } |
3123 | 3179 | ||
3124 | public void TriggerOnRegionStarted(Scene scene) | 3180 | public void TriggerOnRegionStarted(Scene scene) |
@@ -3310,6 +3366,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
3310 | } | 3366 | } |
3311 | } | 3367 | } |
3312 | 3368 | ||
3369 | public void TriggerThrottleUpdate(ScenePresence scenePresence) | ||
3370 | { | ||
3371 | ThrottleUpdate handler = OnThrottleUpdate; | ||
3372 | if (handler != null) | ||
3373 | { | ||
3374 | handler(scenePresence); | ||
3375 | } | ||
3376 | } | ||
3377 | |||
3313 | // public void TriggerGatherUuids(SceneObjectPart sop, IDictionary<UUID, AssetType> assetUuids) | 3378 | // public void TriggerGatherUuids(SceneObjectPart sop, IDictionary<UUID, AssetType> assetUuids) |
3314 | // { | 3379 | // { |
3315 | // GatherUuids handler = OnGatherUuids; | 3380 | // GatherUuids handler = OnGatherUuids; |