2 files changed, 27 insertions, 20 deletions

diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index eb06fcc..d05abc5 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -118,7 +118,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
         {
             uint sun = 0;
 
-            if (!Scene.RegionInfo.EstateSettings.UseGlobalTime)
+            if (Scene.RegionInfo.EstateSettings.FixedSun)
                 sun = (uint)(Scene.RegionInfo.EstateSettings.SunPosition * 1024.0) + 0x1800;
             UUID estateOwner;
             estateOwner = Scene.RegionInfo.EstateSettings.EstateOwner;
@@ -1091,6 +1091,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
             {
                 Scene.RegionInfo.EstateSettings.UseGlobalTime = false;
                 Scene.RegionInfo.EstateSettings.SunPosition = (parms2 - 0x1800)/1024.0;
+                // Warning: FixedSun should be set to True, otherwise this sun position won't be used.
             }
 
             if ((parms1 & 0x00000010) != 0)
diff --git a/OpenSim/Region/CoreModules/World/Sun/SunModule.cs b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
index a321c09..6f344c8 100644
--- a/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
@@ -252,12 +252,11 @@ namespace OpenSim.Region.CoreModules
             }
 
             // TODO: Decouple this, so we can get rid of Linden Hour info
-            // Update Region infor with new Sun Position and Hour
+            // Update Region with new Sun Vector
             // set estate settings for region access to sun position
             if (receivedEstateToolsSunUpdate)
             {
                 m_scene.RegionInfo.RegionSettings.SunVector = Position;
-                m_scene.RegionInfo.RegionSettings.SunPosition = GetCurrentTimeAsLindenSunHour();
             }
         }
 
@@ -395,7 +394,7 @@ namespace OpenSim.Region.CoreModules
             ready = false;
 
             // Remove our hooks
-            m_scene.EventManager.OnFrame     -= SunUpdate;
+            m_scene.EventManager.OnFrame -= SunUpdate;
             m_scene.EventManager.OnAvatarEnteringNewParcel -= AvatarEnteringParcel;
             m_scene.EventManager.OnEstateToolsSunUpdate -= EstateToolsSunUpdate;
             m_scene.EventManager.OnGetCurrentTimeAsLindenSunHour -= GetCurrentTimeAsLindenSunHour;
@@ -459,26 +458,33 @@ namespace OpenSim.Region.CoreModules
             SunToClient(avatar.ControllingClient);
         }
 
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <param name="FixedTime">Is the sun's position fixed?</param>
-        /// <param name="useEstateTime">Use the Region or Estate Sun hour?</param>
-        /// <param name="FixedSunHour">What hour of the day is the Sun Fixed at?</param>
-        public void EstateToolsSunUpdate(ulong regionHandle, bool FixedSun, bool useEstateTime, float FixedSunHour)
+        public void EstateToolsSunUpdate(ulong regionHandle)
         {
             if (m_scene.RegionInfo.RegionHandle == regionHandle)
             {
-                // Must limit the Sun Hour to 0 ... 24
-                while (FixedSunHour > 24.0f)
-                    FixedSunHour -= 24;
+                float sunFixedHour;
+                bool fixedSun;
 
-                while (FixedSunHour < 0)
-                    FixedSunHour += 24;
+                if (m_scene.RegionInfo.RegionSettings.UseEstateSun)
+                {
+                    sunFixedHour = (float)m_scene.RegionInfo.EstateSettings.SunPosition;
+                    fixedSun = m_scene.RegionInfo.EstateSettings.FixedSun;
+                }
+                else
+                {
+                    sunFixedHour = (float)m_scene.RegionInfo.RegionSettings.SunPosition - 6.0f;
+                    fixedSun = m_scene.RegionInfo.RegionSettings.FixedSun;
+                }
+
+                // Must limit the Sun Hour to 0 ... 24
+                while (sunFixedHour > 24.0f)
+                    sunFixedHour -= 24;
 
-                m_SunFixedHour = FixedSunHour;
-                m_SunFixed = FixedSun;
+                while (sunFixedHour < 0)
+                    sunFixedHour += 24;
+                
+                m_SunFixedHour = sunFixedHour;
+                m_SunFixed = fixedSun;
 
                 // m_log.DebugFormat("[SUN]: Sun Settings Update: Fixed Sun? : {0}", m_SunFixed.ToString());
                 // m_log.DebugFormat("[SUN]: Sun Settings Update: Sun Hour   : {0}", m_SunFixedHour.ToString());
@@ -501,7 +507,7 @@ namespace OpenSim.Region.CoreModules
         {
             m_scene.ForEachRootClient(delegate(IClientAPI client)
             {
-                    SunToClient(client);
+                SunToClient(client);
             });
         }