aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs7
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 6ecafd4..a299dba 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -542,7 +542,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
542 m_CurrentResult = null; 542 m_CurrentResult = null;
543 } 543 }
544 544
545 return true; 545 return false;
546 } 546 }
547 547
548 [DebuggerNonUserCode] //Prevents the debugger from farting in this function 548 [DebuggerNonUserCode] //Prevents the debugger from farting in this function
@@ -998,7 +998,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
998 public string GetXMLState() 998 public string GetXMLState()
999 { 999 {
1000 bool run = Running; 1000 bool run = Running;
1001 Stop(100); 1001 bool stopped = Stop(100);
1002 Running = run; 1002 Running = run;
1003 1003
1004 // We should not be doing this, but since we are about to 1004 // We should not be doing this, but since we are about to
@@ -1009,6 +1009,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
1009 1009
1010 // Force an update of the in-memory plugin data 1010 // Force an update of the in-memory plugin data
1011 // 1011 //
1012 if (!stopped)
1013 return String.Empty;
1014
1012 PluginData = AsyncCommandManager.GetSerializationData(m_Engine, m_ItemID); 1015 PluginData = AsyncCommandManager.GetSerializationData(m_Engine, m_ItemID);
1013 1016
1014 return ScriptSerializer.Serialize(this); 1017 return ScriptSerializer.Serialize(this);