diff options
| author | Melanie | 2012-12-18 09:45:40 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-18 09:45:40 +0000 |
| commit | caea7601cb64be6c872dd44b61df10fb2e5f4e96 (patch) | |
| tree | 9cba3186c574d3ecbef73646e0efc3ab3b68f90c /OpenSim/Region/ScriptEngine/XEngine | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-caea7601cb64be6c872dd44b61df10fb2e5f4e96.zip opensim-SC_OLD-caea7601cb64be6c872dd44b61df10fb2e5f4e96.tar.gz opensim-SC_OLD-caea7601cb64be6c872dd44b61df10fb2e5f4e96.tar.bz2 opensim-SC_OLD-caea7601cb64be6c872dd44b61df10fb2e5f4e96.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine')
| -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 494e0b6..0bd9a06 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
| @@ -1783,7 +1783,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 1783 | { | 1783 | { |
| 1784 | IScriptInstance instance = GetInstance(itemID); | 1784 | IScriptInstance instance = GetInstance(itemID); |
| 1785 | if (instance != null) | 1785 | if (instance != null) |
| 1786 | instance.ResetScript(); | 1786 | instance.ResetScript(m_WaitForEventCompletionOnScriptStop); |
| 1787 | } | 1787 | } |
| 1788 | 1788 | ||
| 1789 | public void StartScript(UUID itemID) | 1789 | public void StartScript(UUID itemID) |