diff --git a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs index 2e883d6879..9d79b3ade8 100644 --- a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs +++ b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs @@ -66,12 +66,8 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController public void Initialise (OpenSimBase openSim) { m_openSim = openSim; - } - - public void PostInitialise () - { - m_log.DebugFormat("[REGIONMODULES]: Initializing..."); m_openSim.ApplicationRegistry.RegisterInterface(this); + m_log.DebugFormat("[REGIONMODULES]: Initializing..."); // Who we are string id = AddinManager.CurrentAddin.Id; @@ -108,7 +104,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController continue; // Split off port, if present - string[] moduleParts = moduleString.Split(new char[] {'/'}, 2); + string[] moduleParts = moduleString.Split(new char[] { '/' }, 2); // Format is [port/][class] string className = moduleParts[0]; if (moduleParts.Length > 1) @@ -138,7 +134,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController continue; // Split off port, if present - string[] moduleParts = moduleString.Split(new char[] {'/'}, 2); + string[] moduleParts = moduleString.Split(new char[] { '/' }, 2); // Format is [port/][class] string className = moduleParts[0]; if (moduleParts.Length > 1) @@ -166,7 +162,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController // foreach (TypeExtensionNode node in m_sharedModules) { - Object[] ctorArgs = new Object[] {(uint)0}; + Object[] ctorArgs = new Object[] { (uint)0 }; // Read the config again string moduleString = @@ -176,7 +172,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController if (moduleString != String.Empty) { // Get the port number from the string - string[] moduleParts = moduleString.Split(new char[] {'/'}, + string[] moduleParts = moduleString.Split(new char[] { '/' }, 2); if (moduleParts.Length > 1) ctorArgs[0] = Convert.ToUInt32(moduleParts[0]); @@ -202,11 +198,19 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController module.Initialise(m_openSim.ConfigSource.Source); } + + } + + public void PostInitialise () + { + m_log.DebugFormat("[REGIONMODULES]: PostInitializing..."); + // Immediately run PostInitialise on shared modules foreach (ISharedRegionModule module in m_sharedInstances) { module.PostInitialise(); } + } #endregion diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index f3f715a16e..c6932cf70b 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs @@ -197,6 +197,7 @@ namespace OpenSim LoadPlugins(); foreach (IApplicationPlugin plugin in m_plugins) { + m_log.Debug("XXX PostInitialise " + plugin.Name); plugin.PostInitialise(); }