From 9590e671e6efc5c8da74f22b7038f1ce10501620 Mon Sep 17 00:00:00 2001
From: Dr Scofield
Date: Fri, 30 May 2008 12:29:30 +0000
Subject: 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.


---
 OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs | 9 ++++++---
 OpenSim/ApplicationPlugins/Rest/RestPlugin.cs               | 8 ++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'OpenSim/ApplicationPlugins')

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
     public partial class RestRegionPlugin : RestPlugin
     {
         private static XmlSerializerNamespaces _xmlNs;
+
+        static RestRegionPlugin()
+        {
+            _xmlNs = new XmlSerializerNamespaces();
+            _xmlNs.Add(String.Empty, String.Empty);
+        }
         
         #region overriding properties
         public override string Name
@@ -91,9 +97,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
                 }
                 m_log.InfoFormat("{0} REST region plugin enabled", MsgID);
                 
-                _xmlNs = new XmlSerializerNamespaces();
-                _xmlNs.Add(String.Empty, String.Empty);
-
                 // add REST method handlers
                 AddRestStreamHandler("GET", "/regions/", GetHandler);
                 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
         }
 
         /// <summary>
+        /// Access to GOD password string
+        /// </summary>
+        protected string GodKey
+        {
+            get { return _godkey; }
+        }
+
+        /// <summary>
         /// Configuration of the plugin
         /// </summary>
         public IConfig Config
-- 
cgit v1.1