aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTedd Hansen2008-02-20 17:14:01 +0000
committerTedd Hansen2008-02-20 17:14:01 +0000
commit96edcea3aece0da0e34a765ef4bc3a70a069b272 (patch)
tree6f6908a9b5d936ab231436790c0dcec124080fc1 /OpenSim
parent* re-enabled AssetNotFound code (diff)
downloadopensim-SC_OLD-96edcea3aece0da0e34a765ef4bc3a70a069b272.zip
opensim-SC_OLD-96edcea3aece0da0e34a765ef4bc3a70a069b272.tar.gz
opensim-SC_OLD-96edcea3aece0da0e34a765ef4bc3a70a069b272.tar.bz2
opensim-SC_OLD-96edcea3aece0da0e34a765ef4bc3a70a069b272.tar.xz
llSetTimerEvent was setting seconds as milliseconds causing major problems in timed scripts...
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncLSLCommandManager.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 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
1244 { 1244 {
1245 m_host.AddScriptLPS(1); 1245 m_host.AddScriptLPS(1);
1246 // Setting timer repeat 1246 // Setting timer repeat
1247 m_ScriptEngine.m_ASYNCLSLCommandManager.SetTimerEvent(m_localID, m_itemID, sec); 1247 m_ScriptEngine.m_ASYNCLSLCommandManager.SetTimerEvent(m_localID, m_itemID, sec / 1000);
1248 } 1248 }
1249 1249
1250 public void llSleep(double sec) 1250 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
160 TimerClass ts = new TimerClass(); 160 TimerClass ts = new TimerClass();
161 ts.localID = m_localID; 161 ts.localID = m_localID;
162 ts.itemID = m_itemID; 162 ts.itemID = m_itemID;
163 ts.interval = sec; 163 ts.interval = sec / 1000;
164 ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval); 164 ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);
165 lock (TimerListLock) 165 lock (TimerListLock)
166 { 166 {