diff options
author | Teravus Ovares | 2008-06-02 10:01:02 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-06-02 10:01:02 +0000 |
commit | 42c5dca9896964f89dbd6c71bfa0057940eda80d (patch) | |
tree | a6bcebf118c05b02403b8f0c2de1ced2857c4cd9 /OpenSim/Region/Environment/Scenes | |
parent | cleanup: uncommenting null-op else tree in TaskInventoryItem.cs (diff) | |
download | opensim-SC-42c5dca9896964f89dbd6c71bfa0057940eda80d.zip opensim-SC-42c5dca9896964f89dbd6c71bfa0057940eda80d.tar.gz opensim-SC-42c5dca9896964f89dbd6c71bfa0057940eda80d.tar.bz2 opensim-SC-42c5dca9896964f89dbd6c71bfa0057940eda80d.tar.xz |
* Fixes a bug saving the current sun phase to the estate_settings file.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/EventManager.cs | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/EventManager.cs b/OpenSim/Region/Environment/Scenes/EventManager.cs index c7d21c8..ea44f9a 100644 --- a/OpenSim/Region/Environment/Scenes/EventManager.cs +++ b/OpenSim/Region/Environment/Scenes/EventManager.cs | |||
@@ -228,6 +228,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
228 | public delegate void ChatBroadcastEvent(Object sender, ChatFromViewerArgs chat); | 228 | public delegate void ChatBroadcastEvent(Object sender, ChatFromViewerArgs chat); |
229 | public event ChatBroadcastEvent OnChatBroadcast; | 229 | public event ChatBroadcastEvent OnChatBroadcast; |
230 | 230 | ||
231 | public delegate float SunLindenHour(); | ||
232 | public event SunLindenHour OnGetSunLindenHour; | ||
233 | |||
231 | public class MoneyTransferArgs : EventArgs | 234 | public class MoneyTransferArgs : EventArgs |
232 | { | 235 | { |
233 | public LLUUID sender; | 236 | public LLUUID sender; |
@@ -350,6 +353,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
350 | private ScriptTimerEvent handlerScriptTimerEvent = null; | 353 | private ScriptTimerEvent handlerScriptTimerEvent = null; |
351 | private EstateToolsTimeUpdate handlerEstateToolsTimeUpdate = null; | 354 | private EstateToolsTimeUpdate handlerEstateToolsTimeUpdate = null; |
352 | 355 | ||
356 | private SunLindenHour handlerSunGetLindenHour = null; | ||
357 | |||
353 | public void TriggerOnScriptChangedEvent(uint localID, uint change) | 358 | public void TriggerOnScriptChangedEvent(uint localID, uint change) |
354 | { | 359 | { |
355 | handlerScriptChangedEvent = OnScriptChangedEvent; | 360 | handlerScriptChangedEvent = OnScriptChangedEvent; |
@@ -810,5 +815,15 @@ namespace OpenSim.Region.Environment.Scenes | |||
810 | handlerEstateToolsTimeUpdate(regionHandle, FixedTime, useEstateTime, LindenHour); | 815 | handlerEstateToolsTimeUpdate(regionHandle, FixedTime, useEstateTime, LindenHour); |
811 | } | 816 | } |
812 | } | 817 | } |
818 | |||
819 | public float GetSunLindenHour() | ||
820 | { | ||
821 | handlerSunGetLindenHour = OnGetSunLindenHour; | ||
822 | if (handlerSunGetLindenHour != null) | ||
823 | { | ||
824 | return handlerSunGetLindenHour(); | ||
825 | } | ||
826 | return 6; | ||
827 | } | ||
813 | } | 828 | } |
814 | } | 829 | } |