aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorSignpostMarv2012-08-26 22:53:59 +0100
committerJustin Clark-Casey (justincc)2012-08-27 23:39:18 +0100
commit72c2d13ac6e350317b59b04bca9c79f371f0528a (patch)
treea6752f2bca78997de0ef58aff690cc3ece5fd0d6 /OpenSim/Region
parentrefactoring to assign the first argument to a variable (diff)
downloadopensim-SC_OLD-72c2d13ac6e350317b59b04bca9c79f371f0528a.zip
opensim-SC_OLD-72c2d13ac6e350317b59b04bca9c79f371f0528a.tar.gz
opensim-SC_OLD-72c2d13ac6e350317b59b04bca9c79f371f0528a.tar.bz2
opensim-SC_OLD-72c2d13ac6e350317b59b04bca9c79f371f0528a.tar.xz
refactoring to load from self (fixes ChanneDigger being absent)
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs16
1 files changed, 11 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index 3546654..620d3b5 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -414,6 +414,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
414 private void LoadPlugins() 414 private void LoadPlugins()
415 { 415 {
416 m_plugineffects = new Dictionary<string, ITerrainEffect>(); 416 m_plugineffects = new Dictionary<string, ITerrainEffect>();
417 LoadPlugins(Assembly.GetCallingAssembly());
417 string plugineffectsPath = "Terrain"; 418 string plugineffectsPath = "Terrain";
418 419
419 // Load the files in the Terrain/ dir 420 // Load the files in the Terrain/ dir
@@ -427,6 +428,16 @@ namespace OpenSim.Region.CoreModules.World.Terrain
427 try 428 try
428 { 429 {
429 Assembly library = Assembly.LoadFrom(file); 430 Assembly library = Assembly.LoadFrom(file);
431 LoadPlugins(library);
432 }
433 catch (BadImageFormatException)
434 {
435 }
436 }
437 }
438
439 private void LoadPlugins(Assembly library)
440 {
430 foreach (Type pluginType in library.GetTypes()) 441 foreach (Type pluginType in library.GetTypes())
431 { 442 {
432 try 443 try
@@ -453,11 +464,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain
453 { 464 {
454 } 465 }
455 } 466 }
456 }
457 catch (BadImageFormatException)
458 {
459 }
460 }
461 } 467 }
462 468
463 public void InstallPlugin(string pluginName, ITerrainEffect effect) 469 public void InstallPlugin(string pluginName, ITerrainEffect effect)