diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 2a1949d..54e3b2d 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -5619,33 +5619,7 @@ Environment.Exit(1); | |||
5619 | 5619 | ||
5620 | public void TriggerEstateSunUpdate() | 5620 | public void TriggerEstateSunUpdate() |
5621 | { | 5621 | { |
5622 | float sun; | 5622 | EventManager.TriggerEstateToolsSunUpdate(RegionInfo.RegionHandle); |
5623 | if (RegionInfo.RegionSettings.UseEstateSun) | ||
5624 | { | ||
5625 | sun = (float)RegionInfo.EstateSettings.SunPosition; | ||
5626 | if (RegionInfo.EstateSettings.UseGlobalTime) | ||
5627 | { | ||
5628 | sun = EventManager.GetCurrentTimeAsSunLindenHour() - 6.0f; | ||
5629 | } | ||
5630 | |||
5631 | // | ||
5632 | EventManager.TriggerEstateToolsSunUpdate( | ||
5633 | RegionInfo.RegionHandle, | ||
5634 | RegionInfo.EstateSettings.FixedSun, | ||
5635 | RegionInfo.RegionSettings.UseEstateSun, | ||
5636 | sun); | ||
5637 | } | ||
5638 | else | ||
5639 | { | ||
5640 | // Use the Sun Position from the Region Settings | ||
5641 | sun = (float)RegionInfo.RegionSettings.SunPosition - 6.0f; | ||
5642 | |||
5643 | EventManager.TriggerEstateToolsSunUpdate( | ||
5644 | RegionInfo.RegionHandle, | ||
5645 | RegionInfo.RegionSettings.FixedSun, | ||
5646 | RegionInfo.RegionSettings.UseEstateSun, | ||
5647 | sun); | ||
5648 | } | ||
5649 | } | 5623 | } |
5650 | 5624 | ||
5651 | private void HandleReloadEstate(string module, string[] cmd) | 5625 | private void HandleReloadEstate(string module, string[] cmd) |