diff options
author | Dr Scofield | 2008-05-30 12:29:30 +0000 |
---|---|---|
committer | Dr Scofield | 2008-05-30 12:29:30 +0000 |
commit | 9590e671e6efc5c8da74f22b7038f1ce10501620 (patch) | |
tree | b9a84a11f2c48c9d43dd3de1fc9a9111ff32c5ab /OpenSim/ApplicationPlugins/Rest | |
parent | * This is Melanie's XEngine script engine. I've not tested this real well, h... (diff) | |
download | opensim-SC_OLD-9590e671e6efc5c8da74f22b7038f1ce10501620.zip opensim-SC_OLD-9590e671e6efc5c8da74f22b7038f1ce10501620.tar.gz opensim-SC_OLD-9590e671e6efc5c8da74f22b7038f1ce10501620.tar.bz2 opensim-SC_OLD-9590e671e6efc5c8da74f22b7038f1ce10501620.tar.xz |
while investigating why IRCBridgeModule.Close() was having no effect, i
noticed that Scene.Close() will only call Close on non-shared region
modules. i've now added code to SceneManager.Close() to collect all
shared region module from each scene before calling Scene.Close()
on it and then, once, all Scenes are closed, go through the list of
collected shared region modules and close them as well. SceneManager.Close()
is only called when we initiate a shutdown --- i've verified that a
Scene restart does not trigger the shutdown of shared modules :-)
also, this adds a couple of bug fixes to the IRCBridgeModule (which
after all didn't take kindly to being closed) as well as a check to
InterregionModule's Close() call.
finally, this fixes the RestPlugin's XmlWriter so that it no longer
includes the "xsd=..." and "xsi=..." junk.
Diffstat (limited to 'OpenSim/ApplicationPlugins/Rest')
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs | 9 | ||||
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/RestPlugin.cs | 8 |
2 files changed, 14 insertions, 3 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs index fa5f117..aeb91a9 100644 --- a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs +++ b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs | |||
@@ -57,6 +57,12 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions | |||
57 | public partial class RestRegionPlugin : RestPlugin | 57 | public partial class RestRegionPlugin : RestPlugin |
58 | { | 58 | { |
59 | private static XmlSerializerNamespaces _xmlNs; | 59 | private static XmlSerializerNamespaces _xmlNs; |
60 | |||
61 | static RestRegionPlugin() | ||
62 | { | ||
63 | _xmlNs = new XmlSerializerNamespaces(); | ||
64 | _xmlNs.Add(String.Empty, String.Empty); | ||
65 | } | ||
60 | 66 | ||
61 | #region overriding properties | 67 | #region overriding properties |
62 | public override string Name | 68 | public override string Name |
@@ -91,9 +97,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions | |||
91 | } | 97 | } |
92 | m_log.InfoFormat("{0} REST region plugin enabled", MsgID); | 98 | m_log.InfoFormat("{0} REST region plugin enabled", MsgID); |
93 | 99 | ||
94 | _xmlNs = new XmlSerializerNamespaces(); | ||
95 | _xmlNs.Add(String.Empty, String.Empty); | ||
96 | |||
97 | // add REST method handlers | 100 | // add REST method handlers |
98 | AddRestStreamHandler("GET", "/regions/", GetHandler); | 101 | AddRestStreamHandler("GET", "/regions/", GetHandler); |
99 | AddRestStreamHandler("POST", "/regions/", PostHandler); | 102 | AddRestStreamHandler("POST", "/regions/", PostHandler); |
diff --git a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs index 8373ea2..ffabb2a 100644 --- a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs +++ b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs | |||
@@ -136,6 +136,14 @@ namespace OpenSim.ApplicationPlugins.Rest | |||
136 | } | 136 | } |
137 | 137 | ||
138 | /// <summary> | 138 | /// <summary> |
139 | /// Access to GOD password string | ||
140 | /// </summary> | ||
141 | protected string GodKey | ||
142 | { | ||
143 | get { return _godkey; } | ||
144 | } | ||
145 | |||
146 | /// <summary> | ||
139 | /// Configuration of the plugin | 147 | /// Configuration of the plugin |
140 | /// </summary> | 148 | /// </summary> |
141 | public IConfig Config | 149 | public IConfig Config |