aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorCharles Krinke2008-07-06 18:39:37 +0000
committerCharles Krinke2008-07-06 18:39:37 +0000
commitdfd5e675c022ebb35e95b4a3d55c4c2ee94d0d6a (patch)
tree1c1e7bc04b0268381022e360fdda4c6304f5dcbb
parentCorrects errors in sphere mesh with dimple start angle > 0 and hollow == 0 (diff)
downloadopensim-SC_OLD-dfd5e675c022ebb35e95b4a3d55c4c2ee94d0d6a.zip
opensim-SC_OLD-dfd5e675c022ebb35e95b4a3d55c4c2ee94d0d6a.tar.gz
opensim-SC_OLD-dfd5e675c022ebb35e95b4a3d55c4c2ee94d0d6a.tar.bz2
opensim-SC_OLD-dfd5e675c022ebb35e95b4a3d55c4c2ee94d0d6a.tar.xz
Mantis#1678. Thank you kindly, Vytek for a patch that:
Changes ...TimeOfDay.Milliseconds to ...TimeOfDay.TotalMilliseconds for llGetTimeOfDay() in both LSL_Api.cs and LSL_BuiltIn_Commands.cs
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 3a866db..1aa7ae3 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -1542,7 +1542,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1542 public double llGetTimeOfDay() 1542 public double llGetTimeOfDay()
1543 { 1543 {
1544 m_host.AddScriptLPS(1); 1544 m_host.AddScriptLPS(1);
1545 return (double)(((DateTime.Now.TimeOfDay.Milliseconds / 1000) % (3600 * 4)) * World.TimeDilation); 1545 return (double)(((DateTime.Now.TimeOfDay.TotalMilliseconds / 1000) % (3600 * 4)) * World.TimeDilation);
1546 } 1546 }
1547 1547
1548 public double llGetWallclock() 1548 public double llGetWallclock()
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 26fe27b..2525de0 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1394,7 +1394,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1394 public double llGetTimeOfDay() 1394 public double llGetTimeOfDay()
1395 { 1395 {
1396 m_host.AddScriptLPS(1); 1396 m_host.AddScriptLPS(1);
1397 return (double) (((DateTime.Now.TimeOfDay.Milliseconds / 1000) % (3600*4))*World.TimeDilation); 1397 return (double) (((DateTime.Now.TimeOfDay.TotalMilliseconds / 1000) % (3600*4))*World.TimeDilation);
1398 } 1398 }
1399 1399
1400 public double llGetWallclock() 1400 public double llGetWallclock()