diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Sun')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Sun/SunModule.cs | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/OpenSim/Region/CoreModules/World/Sun/SunModule.cs b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs index b36684c..060fda6 100644 --- a/OpenSim/Region/CoreModules/World/Sun/SunModule.cs +++ b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs | |||
@@ -25,20 +25,22 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using OpenMetaverse; | 30 | using System.Reflection; |
31 | using Nini.Config; | 31 | using log4net; |
32 | using OpenSim.Framework; | 32 | using Nini.Config; |
33 | using OpenSim.Region.Framework.Interfaces; | 33 | using OpenMetaverse; |
34 | using OpenSim.Region.Framework.Scenes; | 34 | using OpenSim.Framework; |
35 | 35 | using OpenSim.Region.Framework.Interfaces; | |
36 | using OpenSim.Region.Framework.Scenes; | ||
37 | |||
36 | namespace OpenSim.Region.CoreModules | 38 | namespace OpenSim.Region.CoreModules |
37 | { | 39 | { |
38 | public class SunModule : IRegionModule | 40 | public class SunModule : IRegionModule |
39 | { | 41 | { |
40 | 42 | ||
41 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
42 | 44 | ||
43 | private const double SeasonalTilt = 0.03 * Math.PI; // A daily shift of approximately 1.7188 degrees | 45 | private const double SeasonalTilt = 0.03 * Math.PI; // A daily shift of approximately 1.7188 degrees |
44 | private const double AverageTilt = -0.25 * Math.PI; // A 45 degree tilt | 46 | private const double AverageTilt = -0.25 * Math.PI; // A 45 degree tilt |
@@ -104,7 +106,7 @@ namespace OpenSim.Region.CoreModules | |||
104 | private ulong CurrentTime | 106 | private ulong CurrentTime |
105 | { | 107 | { |
106 | get { | 108 | get { |
107 | return (ulong)(((System.DateTime.Now.Ticks) - TicksToEpoch + TicksOffset + LindenHourOffset)/10000000); | 109 | return (ulong)(((DateTime.Now.Ticks) - TicksToEpoch + TicksOffset + LindenHourOffset)/10000000); |
108 | } | 110 | } |
109 | } | 111 | } |
110 | 112 | ||
@@ -161,7 +163,7 @@ namespace OpenSim.Region.CoreModules | |||
161 | 163 | ||
162 | // Align ticks with Second Life | 164 | // Align ticks with Second Life |
163 | 165 | ||
164 | TicksToEpoch = new System.DateTime(1970,1,1).Ticks; | 166 | TicksToEpoch = new DateTime(1970,1,1).Ticks; |
165 | 167 | ||
166 | // Just in case they don't have the stanzas | 168 | // Just in case they don't have the stanzas |
167 | try | 169 | try |