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

Mantis#1498. Thank you Melanie for an XEngine patch that addresses: 

The attatched patch makes the changed() event fire properly and 
lets scripts run properly. 
NOTE: All existing state files must be deleted:
rm ScriptEngines/*/*.state
0.6.0-stable
Charles Krinke 2008-06-08 14:51:59 +00:00
parent 4ea9183b66
commit de11c09794
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@ -974,8 +974,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
// but if there is state, then we fire the change // but if there is state, then we fire the change
// event // event
if(stateSource == StateSource.NewRez) if(stateSource == StateSource.NewRez)
PostEvent(new XEventParams("changed", {
new Object[] {256}, new XDetectParams[0])); // m_Engine.Log.Debug("[XEngine] Posted changed(CHANGED_REGION_RESTART) to script");
PostEvent(new XEventParams("changed",
new Object[] {new LSL_Types.LSLInteger(256)}, new XDetectParams[0]));
}
} }
} }
else else
@ -1323,7 +1326,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine
{ {
public static string Serialize(XScriptInstance instance) public static string Serialize(XScriptInstance instance)
{ {
instance.Stop(50); bool running = instance.Running;
if(running)
instance.Stop(50);
XmlDocument xmldoc = new XmlDocument(); XmlDocument xmldoc = new XmlDocument();
@ -1340,11 +1346,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
rootElement.AppendChild(state); rootElement.AppendChild(state);
XmlElement running = xmldoc.CreateElement("", "Running", ""); XmlElement run = xmldoc.CreateElement("", "Running", "");
running.AppendChild(xmldoc.CreateTextNode( run.AppendChild(xmldoc.CreateTextNode(
instance.Running.ToString())); running.ToString()));
rootElement.AppendChild(running); rootElement.AppendChild(run);
Dictionary<string, Object> vars = instance.GetVars(); Dictionary<string, Object> vars = instance.GetVars();
@ -1449,7 +1455,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
rootElement.AppendChild(plugins); rootElement.AppendChild(plugins);
instance.Start(); if(running)
instance.Start();
return xmldoc.InnerXml; return xmldoc.InnerXml;
} }