diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/EventManager.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/EventManager.cs | 38 |
1 files changed, 37 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/EventManager.cs b/OpenSim/Region/Environment/Scenes/EventManager.cs index eee4e4a..5c750e4 100644 --- a/OpenSim/Region/Environment/Scenes/EventManager.cs +++ b/OpenSim/Region/Environment/Scenes/EventManager.cs | |||
@@ -158,9 +158,17 @@ namespace OpenSim.Region.Environment.Scenes | |||
158 | public event ScriptAtTargetEvent OnScriptAtTargetEvent; | 158 | public event ScriptAtTargetEvent OnScriptAtTargetEvent; |
159 | 159 | ||
160 | public delegate void ScriptNotAtTargetEvent(uint localID); | 160 | public delegate void ScriptNotAtTargetEvent(uint localID); |
161 | 161 | ||
162 | public event ScriptNotAtTargetEvent OnScriptNotAtTargetEvent; | 162 | public event ScriptNotAtTargetEvent OnScriptNotAtTargetEvent; |
163 | 163 | ||
164 | public delegate void ScriptColliding(uint localID, ColliderArgs colliders); | ||
165 | |||
166 | public event ScriptColliding OnScriptColliderStart; | ||
167 | public event ScriptColliding OnScriptColliding; | ||
168 | public event ScriptColliding OnScriptCollidingEnd; | ||
169 | |||
170 | |||
171 | |||
164 | public delegate void OnMakeChildAgentDelegate(ScenePresence presence); | 172 | public delegate void OnMakeChildAgentDelegate(ScenePresence presence); |
165 | public event OnMakeChildAgentDelegate OnMakeChildAgent; | 173 | public event OnMakeChildAgentDelegate OnMakeChildAgent; |
166 | 174 | ||
@@ -293,6 +301,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
293 | } | 301 | } |
294 | } | 302 | } |
295 | 303 | ||
304 | |||
305 | |||
296 | public delegate void MoneyTransferEvent(Object sender, MoneyTransferArgs e); | 306 | public delegate void MoneyTransferEvent(Object sender, MoneyTransferArgs e); |
297 | 307 | ||
298 | public delegate void LandBuy(Object sender, LandBuyArgs e); | 308 | public delegate void LandBuy(Object sender, LandBuyArgs e); |
@@ -357,6 +367,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
357 | private ScriptTimerEvent handlerScriptTimerEvent = null; | 367 | private ScriptTimerEvent handlerScriptTimerEvent = null; |
358 | private EstateToolsTimeUpdate handlerEstateToolsTimeUpdate = null; | 368 | private EstateToolsTimeUpdate handlerEstateToolsTimeUpdate = null; |
359 | 369 | ||
370 | private ScriptColliding handlerCollidingStart = null; | ||
371 | private ScriptColliding handlerColliding = null; | ||
372 | private ScriptColliding handlerCollidingEnd = null; | ||
373 | |||
374 | |||
360 | private SunLindenHour handlerSunGetLindenHour = null; | 375 | private SunLindenHour handlerSunGetLindenHour = null; |
361 | 376 | ||
362 | public void TriggerOnScriptChangedEvent(uint localID, uint change) | 377 | public void TriggerOnScriptChangedEvent(uint localID, uint change) |
@@ -838,5 +853,26 @@ namespace OpenSim.Region.Environment.Scenes | |||
838 | } | 853 | } |
839 | return 6; | 854 | return 6; |
840 | } | 855 | } |
856 | |||
857 | public void TriggerScriptCollidingStart(uint localId, ColliderArgs colliders) | ||
858 | { | ||
859 | handlerCollidingStart = OnScriptColliderStart; | ||
860 | if (handlerCollidingStart != null) | ||
861 | handlerCollidingStart(localId, colliders); | ||
862 | } | ||
863 | public void TriggerScriptColliding(uint localId, ColliderArgs colliders) | ||
864 | { | ||
865 | |||
866 | handlerColliding = OnScriptColliding; | ||
867 | if (handlerColliding != null) | ||
868 | handlerColliding(localId, colliders); | ||
869 | } | ||
870 | public void TriggerScriptCollidingEnd(uint localId, ColliderArgs colliders) | ||
871 | { | ||
872 | handlerCollidingEnd = OnScriptCollidingEnd; | ||
873 | if (handlerCollidingEnd != null) | ||
874 | handlerCollidingEnd(localId, colliders); | ||
875 | } | ||
876 | |||
841 | } | 877 | } |
842 | } | 878 | } |