diff options
| author | Justin Clark-Casey (justincc) | 2009-11-27 19:01:45 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2009-11-27 19:01:45 +0000 |
| commit | 2e47e5147547d355d8935404c43fbe1b61888ee1 (patch) | |
| tree | da36d5353f4107d7e59c6456c67b12dca081ef3b /OpenSim/Region/ScriptEngine/Shared/Api | |
| parent | Apply patch that fixes the failing T013_eStateSettingsRandomStorage test (diff) | |
| download | opensim-SC_OLD-2e47e5147547d355d8935404c43fbe1b61888ee1.zip opensim-SC_OLD-2e47e5147547d355d8935404c43fbe1b61888ee1.tar.gz opensim-SC_OLD-2e47e5147547d355d8935404c43fbe1b61888ee1.tar.bz2 opensim-SC_OLD-2e47e5147547d355d8935404c43fbe1b61888ee1.tar.xz | |
Make locking of timers and listeners in script related functions consistent
See http://opensimulator.org/mantis/view.php?id=4316
Thanks KittyLiu!
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
| -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 | } |