diff options
| author | Justin Clark-Casey (justincc) | 2015-01-16 23:57:51 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2015-01-16 23:57:51 +0000 |
| commit | 58f7efc41ac1381b6c7ad0fe91f4e3e6e8cfc711 (patch) | |
| tree | 2d313b4d8ef7adfef0a70b41090cdd94e5bd1196 | |
| parent | Prevent a race condition between the script engine backup thread and script r... (diff) | |
| download | opensim-SC-58f7efc41ac1381b6c7ad0fe91f4e3e6e8cfc711.zip opensim-SC-58f7efc41ac1381b6c7ad0fe91f4e3e6e8cfc711.tar.gz opensim-SC-58f7efc41ac1381b6c7ad0fe91f4e3e6e8cfc711.tar.bz2 opensim-SC-58f7efc41ac1381b6c7ad0fe91f4e3e6e8cfc711.tar.xz | |
Add clearqueue code adjustment that should have been in previous commit faaf47a
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 1a64595..83751cf 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
| @@ -1440,10 +1440,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 1440 | m_Scripts.Remove(itemID); | 1440 | m_Scripts.Remove(itemID); |
| 1441 | } | 1441 | } |
| 1442 | 1442 | ||
| 1443 | 1443 | instance.Stop(m_WaitForEventCompletionOnScriptStop, true); | |
| 1444 | instance.ClearQueue(); | ||
| 1445 | |||
| 1446 | instance.Stop(m_WaitForEventCompletionOnScriptStop); | ||
| 1447 | 1444 | ||
| 1448 | // bool objectRemoved = false; | 1445 | // bool objectRemoved = false; |
| 1449 | 1446 | ||