From 72c2d13ac6e350317b59b04bca9c79f371f0528a Mon Sep 17 00:00:00 2001
From: SignpostMarv
Date: Sun, 26 Aug 2012 22:53:59 +0100
Subject: refactoring to load from self (fixes ChanneDigger being absent)

---
 .../Region/CoreModules/World/Terrain/TerrainModule.cs    | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region')

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