aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorSean Dague2008-05-08 12:23:47 +0000
committerSean Dague2008-05-08 12:23:47 +0000
commita1f1c7f5c23afce21b7113e832388010b8c38d12 (patch)
tree3716a1a8d3b95d5f5c5a52e19475db89631aaaa7 /OpenSim/Region
parent* You can haz more spring cleaning. (diff)
downloadopensim-SC_OLD-a1f1c7f5c23afce21b7113e832388010b8c38d12.zip
opensim-SC_OLD-a1f1c7f5c23afce21b7113e832388010b8c38d12.tar.gz
opensim-SC_OLD-a1f1c7f5c23afce21b7113e832388010b8c38d12.tar.bz2
opensim-SC_OLD-a1f1c7f5c23afce21b7113e832388010b8c38d12.tar.xz
From: Alan M Webb <awebb@vnet.ibm.com>
Introduce time dilation in scripts.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs4
1 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 74494d9..5c705b3 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -1454,7 +1454,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1454 { 1454 {
1455 m_host.AddScriptLPS(1); 1455 m_host.AddScriptLPS(1);
1456 TimeSpan ScriptTime = DateTime.Now - m_timer; 1456 TimeSpan ScriptTime = DateTime.Now - m_timer;
1457 return (double)(ScriptTime.TotalMilliseconds / 1000); 1457 return (double)((ScriptTime.TotalMilliseconds / 1000)*World.TimeDilation);
1458 } 1458 }
1459 1459
1460 public void llResetTime() 1460 public void llResetTime()
@@ -1468,7 +1468,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1468 m_host.AddScriptLPS(1); 1468 m_host.AddScriptLPS(1);
1469 TimeSpan ScriptTime = DateTime.Now - m_timer; 1469 TimeSpan ScriptTime = DateTime.Now - m_timer;
1470 m_timer = DateTime.Now; 1470 m_timer = DateTime.Now;
1471 return (double)(ScriptTime.TotalMilliseconds / 1000); 1471 return (double)((ScriptTime.TotalMilliseconds / 1000)*World.TimeDilation);
1472 } 1472 }
1473 1473
1474 public void llSound() 1474 public void llSound()