diff options
| author | Teravus Ovares (Dan Olivares) | 2009-11-27 19:17:54 -0500 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-11-27 19:17:54 -0500 |
| commit | e7333515d95f063ce5dfe714b4cf34db85549a90 (patch) | |
| tree | cf320591d49e96c67baffdb1f96c4165eafc2741 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs | |
| parent | * Re-enable lightweight packet tracking stats on a 3000 ms interval. (diff) | |
| parent | Rename TestAssetDataPlugin to MockAssetDataPlugin (diff) | |
| download | opensim-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/Api/Implementation/Plugins/Timer.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs | 5 |
1 files changed, 4 insertions, 1 deletions
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 | } |