OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Next OSG test. Cowardly refuse to save the state of badly behaved scripts, instead of forcing the issue.

0.6.9-post-fixes
Melanie 2010-06-02 18:05:58 +01:00
parent c38f7c96e7
commit 20e6b7a320
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
View File

@ -541,7 +541,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
m_CurrentResult = null; m_CurrentResult = null;
} }
return true; return false;
} }
public void SetState(string state) public void SetState(string state)
@ -991,7 +991,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
public string GetXMLState() public string GetXMLState()
{ {
bool run = Running; bool run = Running;
Stop(100); bool stopped = Stop(100);
Running = run; Running = run;
// We should not be doing this, but since we are about to // We should not be doing this, but since we are about to
@ -1002,6 +1002,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
// Force an update of the in-memory plugin data // Force an update of the in-memory plugin data
// //
if (!stopped)
return String.Empty;
PluginData = AsyncCommandManager.GetSerializationData(m_Engine, m_ItemID); PluginData = AsyncCommandManager.GetSerializationData(m_Engine, m_ItemID);
return ScriptSerializer.Serialize(this); return ScriptSerializer.Serialize(this);