diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs | 11 |
2 files changed, 0 insertions, 20 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 8d92ba5..983eed2 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
@@ -122,8 +122,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
122 | 122 | ||
123 | public bool Running { get; set; } | 123 | public bool Running { get; set; } |
124 | 124 | ||
125 | public bool Run { get; set; } | ||
126 | |||
127 | public bool Suspended | 125 | public bool Suspended |
128 | { | 126 | { |
129 | get { return m_Suspended; } | 127 | get { return m_Suspended; } |
@@ -219,7 +217,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
219 | m_postOnRez = postOnRez; | 217 | m_postOnRez = postOnRez; |
220 | m_AttachedAvatar = part.ParentGroup.AttachedAvatar; | 218 | m_AttachedAvatar = part.ParentGroup.AttachedAvatar; |
221 | m_RegionID = part.ParentGroup.Scene.RegionInfo.RegionID; | 219 | m_RegionID = part.ParentGroup.Scene.RegionInfo.RegionID; |
222 | Run = true; | ||
223 | 220 | ||
224 | if (part != null) | 221 | if (part != null) |
225 | { | 222 | { |
@@ -360,9 +357,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
360 | 357 | ||
361 | if (m_startedFromSavedState) | 358 | if (m_startedFromSavedState) |
362 | { | 359 | { |
363 | if (!Run) | ||
364 | return; | ||
365 | |||
366 | Start(); | 360 | Start(); |
367 | if (m_postOnRez) | 361 | if (m_postOnRez) |
368 | { | 362 | { |
@@ -395,9 +389,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
395 | } | 389 | } |
396 | else | 390 | else |
397 | { | 391 | { |
398 | if (!Run) | ||
399 | return; | ||
400 | |||
401 | Start(); | 392 | Start(); |
402 | PostEvent(new EventParams("state_entry", | 393 | PostEvent(new EventParams("state_entry", |
403 | new Object[0], new DetectParams[0])); | 394 | new Object[0], new DetectParams[0])); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs index 797bce3..bcdc7bf 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs | |||
@@ -55,7 +55,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
55 | public static string Serialize(ScriptInstance instance) | 55 | public static string Serialize(ScriptInstance instance) |
56 | { | 56 | { |
57 | bool running = instance.Running; | 57 | bool running = instance.Running; |
58 | bool enabled = instance.Run; | ||
59 | 58 | ||
60 | XmlDocument xmldoc = new XmlDocument(); | 59 | XmlDocument xmldoc = new XmlDocument(); |
61 | 60 | ||
@@ -78,12 +77,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
78 | 77 | ||
79 | rootElement.AppendChild(run); | 78 | rootElement.AppendChild(run); |
80 | 79 | ||
81 | XmlElement run_enable = xmldoc.CreateElement("", "Run", ""); | ||
82 | run_enable.AppendChild(xmldoc.CreateTextNode( | ||
83 | enabled.ToString())); | ||
84 | |||
85 | rootElement.AppendChild(run_enable); | ||
86 | |||
87 | Dictionary<string, Object> vars = instance.GetVars(); | 80 | Dictionary<string, Object> vars = instance.GetVars(); |
88 | 81 | ||
89 | XmlElement variables = xmldoc.CreateElement("", "Variables", ""); | 82 | XmlElement variables = xmldoc.CreateElement("", "Variables", ""); |
@@ -232,7 +225,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
232 | { | 225 | { |
233 | object varValue; | 226 | object varValue; |
234 | XmlNodeList partL = rootNode.ChildNodes; | 227 | XmlNodeList partL = rootNode.ChildNodes; |
235 | instance.Run = true; | ||
236 | 228 | ||
237 | foreach (XmlNode part in partL) | 229 | foreach (XmlNode part in partL) |
238 | { | 230 | { |
@@ -244,9 +236,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
244 | case "Running": | 236 | case "Running": |
245 | instance.Running=bool.Parse(part.InnerText); | 237 | instance.Running=bool.Parse(part.InnerText); |
246 | break; | 238 | break; |
247 | case "Run": | ||
248 | instance.Run = bool.Parse(part.InnerText); | ||
249 | break; | ||
250 | case "Variables": | 239 | case "Variables": |
251 | XmlNodeList varL = part.ChildNodes; | 240 | XmlNodeList varL = part.ChildNodes; |
252 | foreach (XmlNode var in varL) | 241 | foreach (XmlNode var in varL) |