diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 7c9c639..6eb292d 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -332,19 +332,9 @@ namespace OpenSim | |||
332 | foreach (TypeExtensionNode node in nodes) | 332 | foreach (TypeExtensionNode node in nodes) |
333 | { | 333 | { |
334 | IApplicationPlugin plugin = (IApplicationPlugin) node.CreateInstance(); | 334 | IApplicationPlugin plugin = (IApplicationPlugin) node.CreateInstance(); |
335 | 335 | ||
336 | // Debug code to try and track down a bizzare ubuntu/mono/linux bug on standalone where we | 336 | plugin.Initialise(this); |
337 | // appear to try and initialize all the plugins twice. Currently disabled | 337 | m_plugins.Add(plugin); |
338 | // MainLog.Instance.Verbose("PLUGINS", "Hitting plugin {0}", plugin.ToString()); | ||
339 | // if (m_plugins.Contains(plugin)) | ||
340 | // { | ||
341 | // MainLog.Instance.Verbose("PLUGINS", "Skipping {0}", plugin.ToString()); | ||
342 | // } | ||
343 | // else | ||
344 | // { | ||
345 | plugin.Initialise(this); | ||
346 | m_plugins.Add(plugin); | ||
347 | // } | ||
348 | } | 338 | } |
349 | 339 | ||
350 | // Start UDP servers | 340 | // Start UDP servers |
@@ -384,7 +374,7 @@ namespace OpenSim | |||
384 | 374 | ||
385 | m_moduleLoader.PickupModules(scene, "."); | 375 | m_moduleLoader.PickupModules(scene, "."); |
386 | //m_moduleLoader.PickupModules(scene, "ScriptEngines"); | 376 | //m_moduleLoader.PickupModules(scene, "ScriptEngines"); |
387 | m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll"), scene); | 377 | m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", "OpenSim.Region.ScriptEngine.DotNetEngine.dll"), scene); |
388 | 378 | ||
389 | 379 | ||
390 | m_moduleLoader.InitialiseSharedModules(scene); | 380 | m_moduleLoader.InitialiseSharedModules(scene); |
@@ -952,4 +942,4 @@ namespace OpenSim | |||
952 | 942 | ||
953 | #endregion | 943 | #endregion |
954 | } | 944 | } |
955 | } \ No newline at end of file | 945 | } |