ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 12:25:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

* refactor: change some method names and doc in the physics plugin manager

Browse Source 
* move the directory choice for plugins outside into RegionApplicationBase
This commit is contained in:
Justin Clarke Casey
2008-11-20 19:52:55 +00:00
parent d625095959
commit b9c07730f5
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
View File

@@ -104,26 +104,26 @@ namespace OpenSim.Region.Physics.Manager
}
/// <summary>
/// Load all built-in 'plugins' and those in the bin/Physics diretory
/// Load all plugins in assemblies at the given path
/// </summary>
public void LoadPlugins()
/// <param name="pluginsPath"></param>
public void LoadPluginsFromAssemblies(string assembliesPath)
{
// And now walk all assemblies (DLLs effectively) and see if they are home
// Walk all assemblies (DLLs effectively) and see if they are home
// of a plugin that is of interest for us
string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Physics");
string[] pluginFiles = Directory.GetFiles(path, "*.dll");
string[] pluginFiles = Directory.GetFiles(assembliesPath, "*.dll");
for (int i = 0; i < pluginFiles.Length; i++)
{
LoadPlugin(pluginFiles[i]);
LoadPluginsFromAssembly(pluginFiles[i]);
}
}
/// <summary>
/// Load plugins from a dll at the given path
/// Load plugins from an assembly at the given path
/// </summary>
/// <param name="dllPath"></param>
public void LoadPlugin(string dllPath)
/// <param name="assemblyPath"></param>
public void LoadPluginsFromAssembly(string assemblyPath)
{
// TODO / NOTE
// The assembly named 'OpenSim.Region.Physics.BasicPhysicsPlugin' was loaded from
@@ -138,11 +138,11 @@ namespace OpenSim.Region.Physics.Manager
try
{
pluginAssembly = Assembly.LoadFrom(dllPath);
pluginAssembly = Assembly.LoadFrom(assemblyPath);
}
catch (Exception ex)
{
m_log.Error("[PHYSICS]: Failed to load plugin from " + dllPath, ex);
m_log.Error("[PHYSICS]: Failed to load plugin from " + assemblyPath, ex);
}
if (pluginAssembly != null)
@@ -153,12 +153,12 @@ namespace OpenSim.Region.Physics.Manager
}
catch (ReflectionTypeLoadException ex)
{
m_log.Error("[PHYSICS]: Failed to enumerate types in plugin from " + dllPath + ": " +
m_log.Error("[PHYSICS]: Failed to enumerate types in plugin from " + assemblyPath + ": " +
ex.LoaderExceptions[0].Message, ex);
}
catch (Exception ex)
{
m_log.Error("[PHYSICS]: Failed to enumerate types in plugin from " + dllPath, ex);
m_log.Error("[PHYSICS]: Failed to enumerate types in plugin from " + assemblyPath, ex);
}
if (types != null)