diff options
author | Melanie Thielker | 2008-07-14 01:39:36 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-07-14 01:39:36 +0000 |
commit | 07bd749ac56dc498610fc88e61cc7ab04047620e (patch) | |
tree | 7e1e8f017f1abe0f3dcc21c29bbae7bafb4b456f /OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs | |
parent | Patch #9149 (diff) | |
download | opensim-SC_OLD-07bd749ac56dc498610fc88e61cc7ab04047620e.zip opensim-SC_OLD-07bd749ac56dc498610fc88e61cc7ab04047620e.tar.gz opensim-SC_OLD-07bd749ac56dc498610fc88e61cc7ab04047620e.tar.bz2 opensim-SC_OLD-07bd749ac56dc498610fc88e61cc7ab04047620e.tar.xz |
Patch #9150
Patch 7 of the region patches. Finish off the region parts of the estate dialog. Full user functionality. Terrain textures, heights, water, avatar counts, prim bonus, debug settings and region toggles can now be set from the dialog on a per-region basis. Estate stuff defaults to sane values where there are no defaults, to estate_settings.xml otherwise. Sun still b0rked :(
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs index f73c193..5682de3 100644 --- a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs | |||
@@ -301,7 +301,7 @@ namespace OpenSim.Region.Environment.Modules | |||
301 | } | 301 | } |
302 | 302 | ||
303 | // set estate settings for region access to sun position | 303 | // set estate settings for region access to sun position |
304 | m_scene.RegionInfo.EstateSettings.sunPosition = Position; | 304 | m_scene.RegionInfo.RegionSettings.SunVector = Position; |
305 | //m_scene.RegionInfo.EstateSettings.sunHour = GetLindenEstateHourFromCurrentTime(); | 305 | //m_scene.RegionInfo.EstateSettings.sunHour = GetLindenEstateHourFromCurrentTime(); |
306 | } | 306 | } |
307 | public void ForceSunUpdateToAllClients() | 307 | public void ForceSunUpdateToAllClients() |
@@ -316,8 +316,8 @@ namespace OpenSim.Region.Environment.Modules | |||
316 | } | 316 | } |
317 | 317 | ||
318 | // set estate settings for region access to sun position | 318 | // set estate settings for region access to sun position |
319 | m_scene.RegionInfo.EstateSettings.sunPosition = Position; | 319 | m_scene.RegionInfo.RegionSettings.SunVector = Position; |
320 | m_scene.RegionInfo.EstateSettings.sunHour = GetLindenEstateHourFromCurrentTime(); | 320 | m_scene.RegionInfo.RegionSettings.SunPosition = GetLindenEstateHourFromCurrentTime(); |
321 | } | 321 | } |
322 | /// <summary> | 322 | /// <summary> |
323 | /// Calculate the sun's orbital position and its velocity. | 323 | /// Calculate the sun's orbital position and its velocity. |