aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/EventManager.cs
diff options
context:
space:
mode:
authorRevolution2010-01-10 14:28:53 -0600
committerMelanie2010-01-10 19:58:18 +0000
commit038ec133e648ab99643f5738e4ab85e450e5aa45 (patch)
tree49615f146772b4bef04a75c85b401aa6b21e6393 /OpenSim/Region/Framework/Scenes/EventManager.cs
parentFix a small bug in login disable code (diff)
downloadopensim-SC-038ec133e648ab99643f5738e4ab85e450e5aa45.zip
opensim-SC-038ec133e648ab99643f5738e4ab85e450e5aa45.tar.gz
opensim-SC-038ec133e648ab99643f5738e4ab85e450e5aa45.tar.bz2
opensim-SC-038ec133e648ab99643f5738e4ab85e450e5aa45.tar.xz
Adds land collision events.
CRs cleaned from patch Signed-off-by: Melanie <melanie@t-data.com>
Diffstat (limited to '')
-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 753344d..4dd6f32 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
@@ -439,6 +443,9 @@ namespace OpenSim.Region.Framework.Scenes
439 private ScriptColliding handlerCollidingStart = null; 443 private ScriptColliding handlerCollidingStart = null;
440 private ScriptColliding handlerColliding = null; 444 private ScriptColliding handlerColliding = null;
441 private ScriptColliding handlerCollidingEnd = null; 445 private ScriptColliding handlerCollidingEnd = null;
446 private ScriptColliding handlerLandCollidingStart = null;
447 private ScriptColliding handlerLandColliding = null;
448 private ScriptColliding handlerLandCollidingEnd = null;
442 private GetScriptRunning handlerGetScriptRunning = null; 449 private GetScriptRunning handlerGetScriptRunning = null;
443 450
444 private SunLindenHour handlerCurrentTimeAsLindenSunHour = null; 451 private SunLindenHour handlerCurrentTimeAsLindenSunHour = null;
@@ -1034,6 +1041,27 @@ namespace OpenSim.Region.Framework.Scenes
1034 handlerCollidingEnd(localId, colliders); 1041 handlerCollidingEnd(localId, colliders);
1035 } 1042 }
1036 1043
1044 public void TriggerScriptLandCollidingStart(uint localId, ColliderArgs colliders)
1045 {
1046 handlerLandCollidingStart = OnScriptLandColliderStart;
1047 if (handlerLandCollidingStart != null)
1048 handlerLandCollidingStart(localId, colliders);
1049 }
1050
1051 public void TriggerScriptLandColliding(uint localId, ColliderArgs colliders)
1052 {
1053 handlerLandColliding = OnScriptLandColliding;
1054 if (handlerLandColliding != null)
1055 handlerLandColliding(localId, colliders);
1056 }
1057
1058 public void TriggerScriptLandCollidingEnd(uint localId, ColliderArgs colliders)
1059 {
1060 handlerLandCollidingEnd = OnScriptLandColliderEnd;
1061 if (handlerLandCollidingEnd != null)
1062 handlerLandCollidingEnd(localId, colliders);
1063 }
1064
1037 public void TriggerSetRootAgentScene(UUID agentID, Scene scene) 1065 public void TriggerSetRootAgentScene(UUID agentID, Scene scene)
1038 { 1066 {
1039 handlerSetRootAgentScene = OnSetRootAgentScene; 1067 handlerSetRootAgentScene = OnSetRootAgentScene;