aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/EventManager.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/EventManager.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/EventManager.cs28
1 files changed, 28 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 68e73b1..3e49691 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -189,6 +189,10 @@ namespace OpenSim.Region.Framework.Scenes
189 public event ScriptColliding OnScriptColliding; 189 public event ScriptColliding OnScriptColliding;
190 public event ScriptColliding OnScriptCollidingEnd; 190 public event ScriptColliding OnScriptCollidingEnd;
191 191
192 public event ScriptColliding OnScriptLandColliderStart;
193 public event ScriptColliding OnScriptLandColliding;
194 public event ScriptColliding OnScriptLandColliderEnd;
195
192 public delegate void OnMakeChildAgentDelegate(ScenePresence presence); 196 public delegate void OnMakeChildAgentDelegate(ScenePresence presence);
193 public event OnMakeChildAgentDelegate OnMakeChildAgent; 197 public event OnMakeChildAgentDelegate OnMakeChildAgent;
194 198
@@ -445,6 +449,9 @@ namespace OpenSim.Region.Framework.Scenes
445 private ScriptColliding handlerCollidingStart = null; 449 private ScriptColliding handlerCollidingStart = null;
446 private ScriptColliding handlerColliding = null; 450 private ScriptColliding handlerColliding = null;
447 private ScriptColliding handlerCollidingEnd = null; 451 private ScriptColliding handlerCollidingEnd = null;
452 private ScriptColliding handlerLandCollidingStart = null;
453 private ScriptColliding handlerLandColliding = null;
454 private ScriptColliding handlerLandCollidingEnd = null;
448 private GetScriptRunning handlerGetScriptRunning = null; 455 private GetScriptRunning handlerGetScriptRunning = null;
449 456
450 private SunLindenHour handlerCurrentTimeAsLindenSunHour = null; 457 private SunLindenHour handlerCurrentTimeAsLindenSunHour = null;
@@ -1058,6 +1065,27 @@ namespace OpenSim.Region.Framework.Scenes
1058 handlerCollidingEnd(localId, colliders); 1065 handlerCollidingEnd(localId, colliders);
1059 } 1066 }
1060 1067
1068 public void TriggerScriptLandCollidingStart(uint localId, ColliderArgs colliders)
1069 {
1070 handlerLandCollidingStart = OnScriptLandColliderStart;
1071 if (handlerLandCollidingStart != null)
1072 handlerLandCollidingStart(localId, colliders);
1073 }
1074
1075 public void TriggerScriptLandColliding(uint localId, ColliderArgs colliders)
1076 {
1077 handlerLandColliding = OnScriptLandColliding;
1078 if (handlerLandColliding != null)
1079 handlerLandColliding(localId, colliders);
1080 }
1081
1082 public void TriggerScriptLandCollidingEnd(uint localId, ColliderArgs colliders)
1083 {
1084 handlerLandCollidingEnd = OnScriptLandColliderEnd;
1085 if (handlerLandCollidingEnd != null)
1086 handlerLandCollidingEnd(localId, colliders);
1087 }
1088
1061 public void TriggerSetRootAgentScene(UUID agentID, Scene scene) 1089 public void TriggerSetRootAgentScene(UUID agentID, Scene scene)
1062 { 1090 {
1063 handlerSetRootAgentScene = OnSetRootAgentScene; 1091 handlerSetRootAgentScene = OnSetRootAgentScene;