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/Modules/World/Estate/EstateManagementModule.cs | |
parent | cleanup: uncommenting null-op else tree in TaskInventoryItem.cs (diff) | |
download | opensim-SC_OLD-42c5dca9896964f89dbd6c71bfa0057940eda80d.zip opensim-SC_OLD-42c5dca9896964f89dbd6c71bfa0057940eda80d.tar.gz opensim-SC_OLD-42c5dca9896964f89dbd6c71bfa0057940eda80d.tar.bz2 opensim-SC_OLD-42c5dca9896964f89dbd6c71bfa0057940eda80d.tar.xz |
* Fixes a bug saving the current sun phase to the estate_settings file.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs index 6476a4b..147e4aa 100644 --- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs | |||
@@ -302,13 +302,19 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
302 | args.redirectGridY = m_scene.RegionInfo.EstateSettings.redirectGridY; | 302 | args.redirectGridY = m_scene.RegionInfo.EstateSettings.redirectGridY; |
303 | args.regionFlags = (uint)(m_scene.RegionInfo.EstateSettings.regionFlags); | 303 | args.regionFlags = (uint)(m_scene.RegionInfo.EstateSettings.regionFlags); |
304 | args.simAccess = (byte)m_scene.RegionInfo.EstateSettings.simAccess; | 304 | args.simAccess = (byte)m_scene.RegionInfo.EstateSettings.simAccess; |
305 | args.sunHour = m_scene.RegionInfo.EstateSettings.sunHour; | 305 | |
306 | if (m_scene.RegionInfo.EstateSettings.useFixedSun) | ||
307 | args.sunHour = m_scene.RegionInfo.EstateSettings.sunHour; | ||
308 | else | ||
309 | args.sunHour = m_scene.EventManager.GetSunLindenHour(); | ||
310 | |||
306 | args.terrainLowerLimit = m_scene.RegionInfo.EstateSettings.terrainLowerLimit; | 311 | args.terrainLowerLimit = m_scene.RegionInfo.EstateSettings.terrainLowerLimit; |
307 | args.terrainRaiseLimit = m_scene.RegionInfo.EstateSettings.terrainRaiseLimit; | 312 | args.terrainRaiseLimit = m_scene.RegionInfo.EstateSettings.terrainRaiseLimit; |
308 | args.useEstateSun = !m_scene.RegionInfo.EstateSettings.useFixedSun; | 313 | args.useEstateSun = !m_scene.RegionInfo.EstateSettings.useFixedSun; |
309 | args.waterHeight = m_scene.RegionInfo.EstateSettings.waterHeight; | 314 | args.waterHeight = m_scene.RegionInfo.EstateSettings.waterHeight; |
310 | args.simName = m_scene.RegionInfo.RegionName; | 315 | args.simName = m_scene.RegionInfo.RegionName; |
311 | 316 | ||
317 | |||
312 | remote_client.sendRegionInfoToEstateMenu(args); | 318 | remote_client.sendRegionInfoToEstateMenu(args); |
313 | } | 319 | } |
314 | 320 | ||