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 cca295c..11b63b7 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -5345,33 +5345,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
5345 | 5345 | ||
5346 | public void TriggerEstateSunUpdate() | 5346 | public void TriggerEstateSunUpdate() |
5347 | { | 5347 | { |
5348 | float sun; | 5348 | EventManager.TriggerEstateToolsSunUpdate(RegionInfo.RegionHandle); |
5349 | if (RegionInfo.RegionSettings.UseEstateSun) | ||
5350 | { | ||
5351 | sun = (float)RegionInfo.EstateSettings.SunPosition; | ||
5352 | if (RegionInfo.EstateSettings.UseGlobalTime) | ||
5353 | { | ||
5354 | sun = EventManager.GetCurrentTimeAsSunLindenHour() - 6.0f; | ||
5355 | } | ||
5356 | |||
5357 | // | ||
5358 | EventManager.TriggerEstateToolsSunUpdate( | ||
5359 | RegionInfo.RegionHandle, | ||
5360 | RegionInfo.EstateSettings.FixedSun, | ||
5361 | RegionInfo.RegionSettings.UseEstateSun, | ||
5362 | sun); | ||
5363 | } | ||
5364 | else | ||
5365 | { | ||
5366 | // Use the Sun Position from the Region Settings | ||
5367 | sun = (float)RegionInfo.RegionSettings.SunPosition - 6.0f; | ||
5368 | |||
5369 | EventManager.TriggerEstateToolsSunUpdate( | ||
5370 | RegionInfo.RegionHandle, | ||
5371 | RegionInfo.RegionSettings.FixedSun, | ||
5372 | RegionInfo.RegionSettings.UseEstateSun, | ||
5373 | sun); | ||
5374 | } | ||
5375 | } | 5349 | } |
5376 | 5350 | ||
5377 | private void HandleReloadEstate(string module, string[] cmd) | 5351 | private void HandleReloadEstate(string module, string[] cmd) |