diff options
author | Teravus Ovares | 2008-05-30 11:25:21 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-05-30 11:25:21 +0000 |
commit | 334d05db05772c61d8ebb9f697ee4219965943f1 (patch) | |
tree | 3e99f1d8f01cbce32846e686fb75a33ebfaa022a /OpenSim/Region/Environment/Scenes/EventManager.cs | |
parent | Update svn properties. Formatting cleanup. (diff) | |
download | opensim-SC_OLD-334d05db05772c61d8ebb9f697ee4219965943f1.zip opensim-SC_OLD-334d05db05772c61d8ebb9f697ee4219965943f1.tar.gz opensim-SC_OLD-334d05db05772c61d8ebb9f697ee4219965943f1.tar.bz2 opensim-SC_OLD-334d05db05772c61d8ebb9f697ee4219965943f1.tar.xz |
* Fixed a dangling event hook that I added.
* Added a Non-finite avatar position reset. This will either handle the <0,0,0> avatar gracefully, or send the avatar to 127,127,127 if that also doesn't work. ( I've only been able to reproduce this error once on my development workstation )
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/EventManager.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/EventManager.cs | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/EventManager.cs b/OpenSim/Region/Environment/Scenes/EventManager.cs index e77bebc..c7d21c8 100644 --- a/OpenSim/Region/Environment/Scenes/EventManager.cs +++ b/OpenSim/Region/Environment/Scenes/EventManager.cs | |||
@@ -180,6 +180,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
180 | 180 | ||
181 | public event ScriptTimerEvent OnScriptTimerEvent; | 181 | public event ScriptTimerEvent OnScriptTimerEvent; |
182 | 182 | ||
183 | public delegate void EstateToolsTimeUpdate(ulong regionHandle, bool FixedTime, bool EstateSun, float LindenHour); | ||
184 | public event EstateToolsTimeUpdate OnEstateToolsTimeUpdate; | ||
183 | 185 | ||
184 | public delegate void ObjectBeingRemovedFromScene(SceneObjectGroup obj); | 186 | public delegate void ObjectBeingRemovedFromScene(SceneObjectGroup obj); |
185 | public event ObjectBeingRemovedFromScene OnObjectBeingRemovedFromScene; | 187 | public event ObjectBeingRemovedFromScene OnObjectBeingRemovedFromScene; |
@@ -346,6 +348,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
346 | private ParcelPrimCountTainted handlerParcelPrimCountTainted = null; | 348 | private ParcelPrimCountTainted handlerParcelPrimCountTainted = null; |
347 | private ObjectBeingRemovedFromScene handlerObjectBeingRemovedFromScene = null; | 349 | private ObjectBeingRemovedFromScene handlerObjectBeingRemovedFromScene = null; |
348 | private ScriptTimerEvent handlerScriptTimerEvent = null; | 350 | private ScriptTimerEvent handlerScriptTimerEvent = null; |
351 | private EstateToolsTimeUpdate handlerEstateToolsTimeUpdate = null; | ||
349 | 352 | ||
350 | public void TriggerOnScriptChangedEvent(uint localID, uint change) | 353 | public void TriggerOnScriptChangedEvent(uint localID, uint change) |
351 | { | 354 | { |
@@ -798,5 +801,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
798 | } | 801 | } |
799 | 802 | ||
800 | } | 803 | } |
804 | |||
805 | public void TriggerEstateToolsTimeUpdate(ulong regionHandle, bool FixedTime, bool useEstateTime, float LindenHour) | ||
806 | { | ||
807 | handlerEstateToolsTimeUpdate = OnEstateToolsTimeUpdate; | ||
808 | if (handlerEstateToolsTimeUpdate != null) | ||
809 | { | ||
810 | handlerEstateToolsTimeUpdate(regionHandle, FixedTime, useEstateTime, LindenHour); | ||
811 | } | ||
812 | } | ||
801 | } | 813 | } |
802 | } | 814 | } |