Correct location of DotNetEngine. Remove some debug stuff since my addins problem turned out to be local.
parent
3c9505199a
commit
db9a7eee51
|
@ -332,19 +332,9 @@ namespace OpenSim
|
||||||
foreach (TypeExtensionNode node in nodes)
|
foreach (TypeExtensionNode node in nodes)
|
||||||
{
|
{
|
||||||
IApplicationPlugin plugin = (IApplicationPlugin) node.CreateInstance();
|
IApplicationPlugin plugin = (IApplicationPlugin) node.CreateInstance();
|
||||||
|
|
||||||
// Debug code to try and track down a bizzare ubuntu/mono/linux bug on standalone where we
|
plugin.Initialise(this);
|
||||||
// appear to try and initialize all the plugins twice. Currently disabled
|
m_plugins.Add(plugin);
|
||||||
// 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);
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Start UDP servers
|
// Start UDP servers
|
||||||
|
@ -384,7 +374,7 @@ namespace OpenSim
|
||||||
|
|
||||||
m_moduleLoader.PickupModules(scene, ".");
|
m_moduleLoader.PickupModules(scene, ".");
|
||||||
//m_moduleLoader.PickupModules(scene, "ScriptEngines");
|
//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);
|
m_moduleLoader.InitialiseSharedModules(scene);
|
||||||
|
@ -952,4 +942,4 @@ namespace OpenSim
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue