diff options
author | Melanie | 2010-06-02 18:05:58 +0100 |
---|---|---|
committer | Melanie | 2010-06-02 18:05:58 +0100 |
commit | 20e6b7a320df97c69c9f23b2081c376951c39bed (patch) | |
tree | cc7e894f58a5541a32a78978fee9bebc08289000 /OpenSim/Region/ScriptEngine | |
parent | Revert "Next OSG TEST RELEASE. Join aborted threads." (diff) | |
download | opensim-SC-20e6b7a320df97c69c9f23b2081c376951c39bed.zip opensim-SC-20e6b7a320df97c69c9f23b2081c376951c39bed.tar.gz opensim-SC-20e6b7a320df97c69c9f23b2081c376951c39bed.tar.bz2 opensim-SC-20e6b7a320df97c69c9f23b2081c376951c39bed.tar.xz |
Next OSG test. Cowardly refuse to save the state of badly behaved scripts, instead of forcing the issue.
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index d30d2dc..18351ad 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
@@ -541,7 +541,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
541 | m_CurrentResult = null; | 541 | m_CurrentResult = null; |
542 | } | 542 | } |
543 | 543 | ||
544 | return true; | 544 | return false; |
545 | } | 545 | } |
546 | 546 | ||
547 | public void SetState(string state) | 547 | public void SetState(string state) |
@@ -991,7 +991,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
991 | public string GetXMLState() | 991 | public string GetXMLState() |
992 | { | 992 | { |
993 | bool run = Running; | 993 | bool run = Running; |
994 | Stop(100); | 994 | bool stopped = Stop(100); |
995 | Running = run; | 995 | Running = run; |
996 | 996 | ||
997 | // We should not be doing this, but since we are about to | 997 | // We should not be doing this, but since we are about to |
@@ -1002,6 +1002,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
1002 | 1002 | ||
1003 | // Force an update of the in-memory plugin data | 1003 | // Force an update of the in-memory plugin data |
1004 | // | 1004 | // |
1005 | if (!stopped) | ||
1006 | return String.Empty; | ||
1007 | |||
1005 | PluginData = AsyncCommandManager.GetSerializationData(m_Engine, m_ItemID); | 1008 | PluginData = AsyncCommandManager.GetSerializationData(m_Engine, m_ItemID); |
1006 | 1009 | ||
1007 | return ScriptSerializer.Serialize(this); | 1010 | return ScriptSerializer.Serialize(this); |