From db9a7eee51a901ca840d19bee3dc2ae690b6d95f Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Mon, 31 Dec 2007 17:52:48 +0000 Subject: [PATCH] Correct location of DotNetEngine. Remove some debug stuff since my addins problem turned out to be local. --- OpenSim/Region/Application/OpenSimMain.cs | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 7c9c639c3e..6eb292d16f 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs @@ -332,19 +332,9 @@ namespace OpenSim foreach (TypeExtensionNode node in nodes) { IApplicationPlugin plugin = (IApplicationPlugin) node.CreateInstance(); - - // Debug code to try and track down a bizzare ubuntu/mono/linux bug on standalone where we - // appear to try and initialize all the plugins twice. Currently disabled -// MainLog.Instance.Verbose("PLUGINS", "Hitting plugin {0}", plugin.ToString()); -// if (m_plugins.Contains(plugin)) -// { -// MainLog.Instance.Verbose("PLUGINS", "Skipping {0}", plugin.ToString()); -// } -// else -// { - plugin.Initialise(this); - m_plugins.Add(plugin); -// } + + plugin.Initialise(this); + m_plugins.Add(plugin); } // Start UDP servers @@ -384,7 +374,7 @@ namespace OpenSim m_moduleLoader.PickupModules(scene, "."); //m_moduleLoader.PickupModules(scene, "ScriptEngines"); - m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll"), scene); + m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", "OpenSim.Region.ScriptEngine.DotNetEngine.dll"), scene); m_moduleLoader.InitialiseSharedModules(scene); @@ -952,4 +942,4 @@ namespace OpenSim #endregion } -} \ No newline at end of file +}