aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
authorDr Scofield2008-05-30 12:29:30 +0000
committerDr Scofield2008-05-30 12:29:30 +0000
commit9590e671e6efc5c8da74f22b7038f1ce10501620 (patch)
treeb9a84a11f2c48c9d43dd3de1fc9a9111ff32c5ab /OpenSim/Region/Environment/Scenes/Scene.cs
parent* This is Melanie's XEngine script engine. I've not tested this real well, h... (diff)
downloadopensim-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/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 2b667c9..c1e8602 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -103,7 +103,11 @@ namespace OpenSim.Region.Environment.Scenes
103 103
104 protected BaseHttpServer m_httpListener; 104 protected BaseHttpServer m_httpListener;
105 105
106 protected Dictionary<string, IRegionModule> Modules = new Dictionary<string, IRegionModule>(); 106 protected Dictionary<string, IRegionModule> m_modules = new Dictionary<string, IRegionModule>();
107 public Dictionary<string, IRegionModule> Modules
108 {
109 get { return m_modules; }
110 }
107 protected Dictionary<Type, object> ModuleInterfaces = new Dictionary<Type, object>(); 111 protected Dictionary<Type, object> ModuleInterfaces = new Dictionary<Type, object>();
108 protected Dictionary<string, object> ModuleAPIMethods = new Dictionary<string, object>(); 112 protected Dictionary<string, object> ModuleAPIMethods = new Dictionary<string, object>();
109 protected Dictionary<string, ICommander> m_moduleCommanders = new Dictionary<string, ICommander>(); 113 protected Dictionary<string, ICommander> m_moduleCommanders = new Dictionary<string, ICommander>();