diff options
author | Melanie | 2013-01-04 22:39:07 +0000 |
---|---|---|
committer | Melanie | 2013-01-04 22:39:07 +0000 |
commit | e62b14024f35121f1fd83bd6d3cd572ed9ba5897 (patch) | |
tree | 987892e6227b79eb45d48c5df0f8b9acfdf30755 /OpenSim/Region/CoreModules/World/Estate | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Set default particle burst count to 1 instead of 0 in any set particle system... (diff) | |
download | opensim-SC_OLD-e62b14024f35121f1fd83bd6d3cd572ed9ba5897.zip opensim-SC_OLD-e62b14024f35121f1fd83bd6d3cd572ed9ba5897.tar.gz opensim-SC_OLD-e62b14024f35121f1fd83bd6d3cd572ed9ba5897.tar.bz2 opensim-SC_OLD-e62b14024f35121f1fd83bd6d3cd572ed9ba5897.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Estate')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index 267332d..9aee491 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
@@ -128,7 +128,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
128 | { | 128 | { |
129 | uint sun = 0; | 129 | uint sun = 0; |
130 | 130 | ||
131 | if (!Scene.RegionInfo.EstateSettings.UseGlobalTime) | 131 | if (Scene.RegionInfo.EstateSettings.FixedSun) |
132 | sun = (uint)(Scene.RegionInfo.EstateSettings.SunPosition * 1024.0) + 0x1800; | 132 | sun = (uint)(Scene.RegionInfo.EstateSettings.SunPosition * 1024.0) + 0x1800; |
133 | UUID estateOwner; | 133 | UUID estateOwner; |
134 | estateOwner = Scene.RegionInfo.EstateSettings.EstateOwner; | 134 | estateOwner = Scene.RegionInfo.EstateSettings.EstateOwner; |
@@ -1128,6 +1128,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
1128 | { | 1128 | { |
1129 | Scene.RegionInfo.EstateSettings.UseGlobalTime = false; | 1129 | Scene.RegionInfo.EstateSettings.UseGlobalTime = false; |
1130 | Scene.RegionInfo.EstateSettings.SunPosition = (parms2 - 0x1800)/1024.0; | 1130 | Scene.RegionInfo.EstateSettings.SunPosition = (parms2 - 0x1800)/1024.0; |
1131 | // Warning: FixedSun should be set to True, otherwise this sun position won't be used. | ||
1131 | } | 1132 | } |
1132 | 1133 | ||
1133 | if ((parms1 & 0x00000010) != 0) | 1134 | if ((parms1 & 0x00000010) != 0) |