diff options
author | Melanie Thielker | 2008-09-07 22:01:25 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-09-07 22:01:25 +0000 |
commit | 669f55340005a450fc236db3b9d660878062219c (patch) | |
tree | 647652958bb8714e8422660a34e8da76823459fc /OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs | |
parent | Mantis #2138 (diff) | |
download | opensim-SC-669f55340005a450fc236db3b9d660878062219c.zip opensim-SC-669f55340005a450fc236db3b9d660878062219c.tar.gz opensim-SC-669f55340005a450fc236db3b9d660878062219c.tar.bz2 opensim-SC-669f55340005a450fc236db3b9d660878062219c.tar.xz |
Xengine patch to force a persistence save on script creation. This prevents
duplicate delivery of state_entry if a region is restarted just after
saving the script. Changes script state saves to no longer abort long-
running event handlers. Queues the save instead. Adds shutdown handler
to save script state on irderly shutdown
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs index bc9b174..a794f02 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs | |||
@@ -56,9 +56,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
56 | { | 56 | { |
57 | bool running = instance.Running; | 57 | bool running = instance.Running; |
58 | 58 | ||
59 | if (running) | ||
60 | instance.Stop(50); | ||
61 | |||
62 | XmlDocument xmldoc = new XmlDocument(); | 59 | XmlDocument xmldoc = new XmlDocument(); |
63 | 60 | ||
64 | XmlNode xmlnode = xmldoc.CreateNode(XmlNodeType.XmlDeclaration, | 61 | XmlNode xmlnode = xmldoc.CreateNode(XmlNodeType.XmlDeclaration, |
@@ -182,9 +179,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
182 | 179 | ||
183 | rootElement.AppendChild(plugins); | 180 | rootElement.AppendChild(plugins); |
184 | 181 | ||
185 | if (running) | ||
186 | instance.Start(); | ||
187 | |||
188 | return xmldoc.InnerXml; | 182 | return xmldoc.InnerXml; |
189 | } | 183 | } |
190 | 184 | ||