diff options
| author | UbitUmarov | 2016-08-21 22:44:07 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-08-21 22:44:21 +0100 |
| commit | 67a853a70eda03d572b99d9bfeb1c48155520c13 (patch) | |
| tree | b394ce72d8758700a4934e0d828ec73c74ca4289 /OpenSim | |
| parent | put back the dangerous resp.ReuseContext = true option, that for some odd re... (diff) | |
| download | opensim-SC-67a853a70eda03d572b99d9bfeb1c48155520c13.zip opensim-SC-67a853a70eda03d572b99d9bfeb1c48155520c13.tar.gz opensim-SC-67a853a70eda03d572b99d9bfeb1c48155520c13.tar.bz2 opensim-SC-67a853a70eda03d572b99d9bfeb1c48155520c13.tar.xz | |
add a missing lock()
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index f739484..6d78f0e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -893,7 +893,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 893 | { | 893 | { |
| 894 | m_InEvent = false; | 894 | m_InEvent = false; |
| 895 | m_CurrentEvent = String.Empty; | 895 | m_CurrentEvent = String.Empty; |
| 896 | m_CurrentWorkItem = null; // no longer in a event that can be canceled | 896 | lock (EventQueue) |
| 897 | m_CurrentWorkItem = null; // no longer in a event that can be canceled | ||
| 897 | } | 898 | } |
| 898 | 899 | ||
| 899 | if (m_SaveState) | 900 | if (m_SaveState) |