diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/EventManager.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index 2ab393f..473920e 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs | |||
@@ -212,10 +212,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
212 | public delegate void RequestChangeWaterHeight(float height); | 212 | public delegate void RequestChangeWaterHeight(float height); |
213 | 213 | ||
214 | public event RequestChangeWaterHeight OnRequestChangeWaterHeight; | 214 | public event RequestChangeWaterHeight OnRequestChangeWaterHeight; |
215 | 215 | ||
216 | public delegate void AvatarKillData(uint KillerLocalID, ScenePresence avatar); | 216 | /// <summary> |
217 | 217 | /// Fired if any avatar is 'killed' due to its health falling to zero | |
218 | /// </summary> | ||
218 | public event AvatarKillData OnAvatarKilled; | 219 | public event AvatarKillData OnAvatarKilled; |
220 | public delegate void AvatarKillData(uint KillerLocalID, ScenePresence avatar); | ||
219 | 221 | ||
220 | // public delegate void ScriptTimerEvent(uint localID, double timerinterval); | 222 | // public delegate void ScriptTimerEvent(uint localID, double timerinterval); |
221 | 223 | ||
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 5419a9a..cd39cab 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -3274,9 +3274,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3274 | } | 3274 | } |
3275 | if (m_health <= 0) | 3275 | if (m_health <= 0) |
3276 | m_scene.EventManager.TriggerAvatarKill(killerObj, this); | 3276 | m_scene.EventManager.TriggerAvatarKill(killerObj, this); |
3277 | } | 3277 | } |
3278 | |||
3279 | |||
3280 | } | 3278 | } |
3281 | 3279 | ||
3282 | public void setHealthWithUpdate(float health) | 3280 | public void setHealthWithUpdate(float health) |