diff options
author | Justin Clark-Casey (justincc) | 2012-07-17 23:34:50 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-07-17 23:34:50 +0100 |
commit | 56870d960959df4fc7a17ab930c11ef9da70046b (patch) | |
tree | 1873329fe71418559b6f0781eaee9e3e0924ea17 /OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |
parent | Fix regression where llGiveInventory() had stopped asking non-owner receivers... (diff) | |
parent | Make the scrpt running flag work properly (diff) | |
download | opensim-SC_OLD-56870d960959df4fc7a17ab930c11ef9da70046b.zip opensim-SC_OLD-56870d960959df4fc7a17ab930c11ef9da70046b.tar.gz opensim-SC_OLD-56870d960959df4fc7a17ab930c11ef9da70046b.tar.bz2 opensim-SC_OLD-56870d960959df4fc7a17ab930c11ef9da70046b.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 01aebb6..7a9c80c 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -108,6 +108,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
108 | private bool m_KillTimedOutScripts; | 108 | private bool m_KillTimedOutScripts; |
109 | private string m_ScriptEnginesPath = null; | 109 | private string m_ScriptEnginesPath = null; |
110 | 110 | ||
111 | private ExpiringCache<UUID, bool> m_runFlags = new ExpiringCache<UUID, bool>(); | ||
112 | |||
111 | /// <summary> | 113 | /// <summary> |
112 | /// Is the entire simulator in the process of shutting down? | 114 | /// Is the entire simulator in the process of shutting down? |
113 | /// </summary> | 115 | /// </summary> |
@@ -1196,6 +1198,14 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1196 | if (instance != null) | 1198 | if (instance != null) |
1197 | instance.Init(); | 1199 | instance.Init(); |
1198 | 1200 | ||
1201 | bool runIt; | ||
1202 | if (m_runFlags.TryGetValue(itemID, out runIt)) | ||
1203 | { | ||
1204 | if (!runIt) | ||
1205 | StopScript(itemID); | ||
1206 | m_runFlags.Remove(itemID); | ||
1207 | } | ||
1208 | |||
1199 | return true; | 1209 | return true; |
1200 | } | 1210 | } |
1201 | 1211 | ||
@@ -1568,6 +1578,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1568 | IScriptInstance instance = GetInstance(itemID); | 1578 | IScriptInstance instance = GetInstance(itemID); |
1569 | if (instance != null) | 1579 | if (instance != null) |
1570 | instance.Start(); | 1580 | instance.Start(); |
1581 | else | ||
1582 | m_runFlags.AddOrUpdate(itemID, true, 240); | ||
1571 | } | 1583 | } |
1572 | 1584 | ||
1573 | public void StopScript(UUID itemID) | 1585 | public void StopScript(UUID itemID) |
@@ -1579,6 +1591,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1579 | // cause issues on mono 2.6, 2.10 and possibly later where locks are not released properly on abort. | 1591 | // cause issues on mono 2.6, 2.10 and possibly later where locks are not released properly on abort. |
1580 | instance.Stop(1000); | 1592 | instance.Stop(1000); |
1581 | } | 1593 | } |
1594 | else | ||
1595 | { | ||
1596 | m_runFlags.AddOrUpdate(itemID, false, 240); | ||
1597 | } | ||
1582 | } | 1598 | } |
1583 | 1599 | ||
1584 | public DetectParams GetDetectParams(UUID itemID, int idx) | 1600 | public DetectParams GetDetectParams(UUID itemID, int idx) |