aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorSignpostMarv2012-08-27 01:50:53 +0100
committerJustin Clark-Casey (justincc)2012-08-27 23:39:18 +0100
commite916b1399f08e726302f576d1653dc7edc445217 (patch)
tree63356f923230c07233d2e3a8514a4d8d6c1a81f5 /OpenSim/Region/CoreModules
parentrefactoring to load from self (fixes ChanneDigger being absent) (diff)
downloadopensim-SC_OLD-e916b1399f08e726302f576d1653dc7edc445217.zip
opensim-SC_OLD-e916b1399f08e726302f576d1653dc7edc445217.tar.gz
opensim-SC_OLD-e916b1399f08e726302f576d1653dc7edc445217.tar.bz2
opensim-SC_OLD-e916b1399f08e726302f576d1653dc7edc445217.tar.xz
formatting
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs44
1 files changed, 22 insertions, 22 deletions
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index 620d3b5..4694b14 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -438,32 +438,32 @@ namespace OpenSim.Region.CoreModules.World.Terrain
438 438
439 private void LoadPlugins(Assembly library) 439 private void LoadPlugins(Assembly library)
440 { 440 {
441 foreach (Type pluginType in library.GetTypes()) 441 foreach (Type pluginType in library.GetTypes())
442 { 442 {
443 try 443 try
444 { 444 {
445 if (pluginType.IsAbstract || pluginType.IsNotPublic) 445 if (pluginType.IsAbstract || pluginType.IsNotPublic)
446 continue; 446 continue;
447 447
448 string typeName = pluginType.Name; 448 string typeName = pluginType.Name;
449 449
450 if (pluginType.GetInterface("ITerrainEffect", false) != null) 450 if (pluginType.GetInterface("ITerrainEffect", false) != null)
451 { 451 {
452 ITerrainEffect terEffect = (ITerrainEffect) Activator.CreateInstance(library.GetType(pluginType.ToString())); 452 ITerrainEffect terEffect = (ITerrainEffect)Activator.CreateInstance(library.GetType(pluginType.ToString()));
453 453
454 InstallPlugin(typeName, terEffect); 454 InstallPlugin(typeName, terEffect);
455 } 455 }
456 else if (pluginType.GetInterface("ITerrainLoader", false) != null) 456 else if (pluginType.GetInterface("ITerrainLoader", false) != null)
457 { 457 {
458 ITerrainLoader terLoader = (ITerrainLoader) Activator.CreateInstance(library.GetType(pluginType.ToString())); 458 ITerrainLoader terLoader = (ITerrainLoader)Activator.CreateInstance(library.GetType(pluginType.ToString()));
459 m_loaders[terLoader.FileExtension] = terLoader; 459 m_loaders[terLoader.FileExtension] = terLoader;
460 m_log.Info("L ... " + typeName); 460 m_log.Info("L ... " + typeName);
461 }
462 }
463 catch (AmbiguousMatchException)
464 {
465 }
466 } 461 }
462 }
463 catch (AmbiguousMatchException)
464 {
465 }
466 }
467 } 467 }
468 468
469 public void InstallPlugin(string pluginName, ITerrainEffect effect) 469 public void InstallPlugin(string pluginName, ITerrainEffect effect)