OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactoring to load from self (fixes ChanneDigger being absent)

integration
SignpostMarv 2012-08-26 22:53:59 +01:00 committed by Justin Clark-Casey (justincc)
parent a6d689c529
commit 72c2d13ac6
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
View File

@ -414,6 +414,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
private void LoadPlugins() private void LoadPlugins()
{ {
m_plugineffects = new Dictionary<string, ITerrainEffect>(); m_plugineffects = new Dictionary<string, ITerrainEffect>();
LoadPlugins(Assembly.GetCallingAssembly());
string plugineffectsPath = "Terrain"; string plugineffectsPath = "Terrain";
// Load the files in the Terrain/ dir // Load the files in the Terrain/ dir
@ -427,6 +428,16 @@ namespace OpenSim.Region.CoreModules.World.Terrain
try try
{ {
Assembly library = Assembly.LoadFrom(file); Assembly library = Assembly.LoadFrom(file);
LoadPlugins(library);
}
catch (BadImageFormatException)
{
}
}
}
private void LoadPlugins(Assembly library)
{
foreach (Type pluginType in library.GetTypes()) foreach (Type pluginType in library.GetTypes())
{ {
try try
@ -454,11 +465,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain
} }
} }
} }
catch (BadImageFormatException)
{
}
}
}
public void InstallPlugin(string pluginName, ITerrainEffect effect) public void InstallPlugin(string pluginName, ITerrainEffect effect)
{ {