diff options
author | Justin Clark-Casey (justincc) | 2011-10-19 21:30:37 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-10-19 21:30:37 +0100 |
commit | 5607fd3af828846291de3358067bb1214619489e (patch) | |
tree | 09459fb954c1944ff0836d59e2e36ffad416b70d /OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |
parent | Add "scripts suspend" and "scripts resume" commands. (diff) | |
download | opensim-SC_OLD-5607fd3af828846291de3358067bb1214619489e.zip opensim-SC_OLD-5607fd3af828846291de3358067bb1214619489e.tar.gz opensim-SC_OLD-5607fd3af828846291de3358067bb1214619489e.tar.bz2 opensim-SC_OLD-5607fd3af828846291de3358067bb1214619489e.tar.xz |
Fix resume scripts.
On resume, we need to place requeue the script for event processing if there are any events on the queue.
Also need to do this under m_Script lock in order to avoid a race
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine/XEngine.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index bb08d90..5ee8dbf 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -946,7 +946,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
946 | if (!m_Scripts.ContainsKey(itemID)) | 946 | if (!m_Scripts.ContainsKey(itemID)) |
947 | return; | 947 | return; |
948 | 948 | ||
949 | instance=m_Scripts[itemID]; | 949 | instance = m_Scripts[itemID]; |
950 | m_Scripts.Remove(itemID); | 950 | m_Scripts.Remove(itemID); |
951 | } | 951 | } |
952 | 952 | ||