llSetTimerEvent was setting seconds as milliseconds causing major problems in timed scripts...

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 1ab2a43..c14a74f 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -1244,7 +1244,7 @@ namespace OpenSim.Region.ScriptEngine.Common
         {
             m_host.AddScriptLPS(1);
             // Setting timer repeat
-            m_ScriptEngine.m_ASYNCLSLCommandManager.SetTimerEvent(m_localID, m_itemID, sec);
+            m_ScriptEngine.m_ASYNCLSLCommandManager.SetTimerEvent(m_localID, m_itemID, sec / 1000);
         }
 
         public void llSleep(double sec)
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncLSLCommandManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncLSLCommandManager.cs
index 0491612..baab096 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncLSLCommandManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncLSLCommandManager.cs
@@ -160,7 +160,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
             TimerClass ts = new TimerClass();
             ts.localID = m_localID;
             ts.itemID = m_itemID;
-            ts.interval = sec;
+            ts.interval = sec / 1000;
             ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);
             lock (TimerListLock)
             {