diff options
author | UbitUmarov | 2019-02-20 20:36:43 +0000 |
---|---|---|
committer | UbitUmarov | 2019-02-20 20:36:43 +0000 |
commit | 0f574d432d6a2dd4a15a9d6bba236a7cf2656454 (patch) | |
tree | edf1e938b1de373e01b40ae15c9132230416d8bd | |
parent | Yengine: let llminEventDelay do something: it just ignores a more limited set... (diff) | |
download | opensim-SC-0f574d432d6a2dd4a15a9d6bba236a7cf2656454.zip opensim-SC-0f574d432d6a2dd4a15a9d6bba236a7cf2656454.tar.gz opensim-SC-0f574d432d6a2dd4a15a9d6bba236a7cf2656454.tar.bz2 opensim-SC-0f574d432d6a2dd4a15a9d6bba236a7cf2656454.tar.xz |
Yengine:save minEventDelay in script state
-rw-r--r-- | OpenSim/Region/ScriptEngine/YEngine/XMRInstCapture.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/YEngine/XMRInstCtor.cs | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRInstCapture.cs b/OpenSim/Region/ScriptEngine/YEngine/XMRInstCapture.cs index 9bb894d..5798638 100644 --- a/OpenSim/Region/ScriptEngine/YEngine/XMRInstCapture.cs +++ b/OpenSim/Region/ScriptEngine/YEngine/XMRInstCapture.cs | |||
@@ -115,6 +115,15 @@ namespace OpenSim.Region.ScriptEngine.Yengine | |||
115 | m_RunOnePhase = "GetExecutionState D"; | 115 | m_RunOnePhase = "GetExecutionState D"; |
116 | CheckRunLockInvariants(true); | 116 | CheckRunLockInvariants(true); |
117 | 117 | ||
118 | if (m_minEventDelay != 0.0) | ||
119 | { | ||
120 | XmlElement minEventDelayN = doc.CreateElement("", "mEvtDly", ""); | ||
121 | minEventDelayN.AppendChild(doc.CreateTextNode(m_minEventDelay.ToString())); | ||
122 | scriptStateN.AppendChild(minEventDelayN); | ||
123 | m_RunOnePhase = "GetExecutionState D"; | ||
124 | CheckRunLockInvariants(true); | ||
125 | } | ||
126 | |||
118 | // More misc data. | 127 | // More misc data. |
119 | XmlNode permissionsN = doc.CreateElement("", "Permissions", ""); | 128 | XmlNode permissionsN = doc.CreateElement("", "Permissions", ""); |
120 | scriptStateN.AppendChild(permissionsN); | 129 | scriptStateN.AppendChild(permissionsN); |
diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRInstCtor.cs b/OpenSim/Region/ScriptEngine/YEngine/XMRInstCtor.cs index b140453..7e13ae4 100644 --- a/OpenSim/Region/ScriptEngine/YEngine/XMRInstCtor.cs +++ b/OpenSim/Region/ScriptEngine/YEngine/XMRInstCtor.cs | |||
@@ -527,6 +527,11 @@ namespace OpenSim.Region.ScriptEngine.Yengine | |||
527 | XmlElement doGblInitN = (XmlElement)scriptStateN.SelectSingleNode("DoGblInit"); | 527 | XmlElement doGblInitN = (XmlElement)scriptStateN.SelectSingleNode("DoGblInit"); |
528 | doGblInit = bool.Parse(doGblInitN.InnerText); | 528 | doGblInit = bool.Parse(doGblInitN.InnerText); |
529 | 529 | ||
530 | double minEventDelay = 0.0; | ||
531 | XmlElement minEventDelayN = (XmlElement)scriptStateN.SelectSingleNode("mEvtDly"); | ||
532 | if(minEventDelayN != null) | ||
533 | minEventDelay = Double.Parse(minEventDelayN.InnerText); | ||
534 | |||
530 | // get values used by stuff like llDetectedGrab, etc. | 535 | // get values used by stuff like llDetectedGrab, etc. |
531 | DetectParams[] detParams = RestoreDetectParams(scriptStateN.SelectSingleNode("DetectArray")); | 536 | DetectParams[] detParams = RestoreDetectParams(scriptStateN.SelectSingleNode("DetectArray")); |
532 | 537 | ||
@@ -576,6 +581,8 @@ namespace OpenSim.Region.ScriptEngine.Yengine | |||
576 | AsyncCommandManager.CreateFromData(m_Engine, | 581 | AsyncCommandManager.CreateFromData(m_Engine, |
577 | m_LocalID, m_ItemID, m_Part.UUID, | 582 | m_LocalID, m_ItemID, m_Part.UUID, |
578 | pluginData); | 583 | pluginData); |
584 | |||
585 | MinEventDelay = minEventDelay; | ||
579 | } | 586 | } |
580 | 587 | ||
581 | private void processXstate(XmlDocument doc) | 588 | private void processXstate(XmlDocument doc) |
@@ -919,6 +926,8 @@ namespace OpenSim.Region.ScriptEngine.Yengine | |||
919 | 926 | ||
920 | AsyncCommandManager.CreateFromData(m_Engine, | 927 | AsyncCommandManager.CreateFromData(m_Engine, |
921 | m_LocalID, m_ItemID, m_Part.UUID, pluginData); | 928 | m_LocalID, m_ItemID, m_Part.UUID, pluginData); |
929 | |||
930 | MinEventDelay = minEventDelay; | ||
922 | } | 931 | } |
923 | 932 | ||
924 | private static void getvarNames(Dictionary<int, string> s, Dictionary<string, int> d) | 933 | private static void getvarNames(Dictionary<int, string> s, Dictionary<string, int> d) |