aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-11-27 19:17:54 -0500
committerTeravus Ovares (Dan Olivares)2009-11-27 19:17:54 -0500
commite7333515d95f063ce5dfe714b4cf34db85549a90 (patch)
treecf320591d49e96c67baffdb1f96c4165eafc2741 /OpenSim/Region/ScriptEngine/Shared
parent* Re-enable lightweight packet tracking stats on a 3000 ms interval. (diff)
parentRename TestAssetDataPlugin to MockAssetDataPlugin (diff)
downloadopensim-SC_OLD-e7333515d95f063ce5dfe714b4cf34db85549a90.zip
opensim-SC_OLD-e7333515d95f063ce5dfe714b4cf34db85549a90.tar.gz
opensim-SC_OLD-e7333515d95f063ce5dfe714b4cf34db85549a90.tar.bz2
opensim-SC_OLD-e7333515d95f063ce5dfe714b4cf34db85549a90.tar.xz
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs5
2 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 5de23ad..f5cda2c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1037,7 +1037,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1037 return detectedParams.TouchUV; 1037 return detectedParams.TouchUV;
1038 } 1038 }
1039 1039
1040 public void llDie() 1040 public virtual void llDie()
1041 { 1041 {
1042 m_host.AddScriptLPS(1); 1042 m_host.AddScriptLPS(1);
1043 throw new SelfDeleteException(); 1043 throw new SelfDeleteException();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
index 0716d45..eeb59d9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
@@ -166,7 +166,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
166 ts.next = DateTime.Now.Ticks + (long)data[idx+1]; 166 ts.next = DateTime.Now.Ticks + (long)data[idx+1];
167 idx += 2; 167 idx += 2;
168 168
169 Timers.Add(MakeTimerKey(localID,itemID), ts); 169 lock (TimerListLock)
170 {
171 Timers.Add(MakeTimerKey(localID, itemID), ts);
172 }
170 } 173 }
171 } 174 }
172 } 175 }