* Added new InstallPlugin interface to ITerrainModule.

* This is to allow other region modules to install Terrain Effects.

2 files changed, 22 insertions, 10 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainModule.cs b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainModule.cs
index dc8c41b..6ab2372 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainModule.cs
@@ -31,5 +31,6 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain
     {
         void LoadFromFile(string filename);
         void SaveToFile(string filename);
+        void InstallPlugin(string name, ITerrainEffect plug);
     }
 }
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs
index 4562fb6..20c0086 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs
@@ -242,24 +242,19 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain
                             if (pluginType.IsAbstract || pluginType.IsNotPublic)
                                 continue;
 
+                            string typeName = pluginType.Name;
+
                             if (pluginType.GetInterface("ITerrainEffect", false) != null)
                             {
                                 ITerrainEffect terEffect = (ITerrainEffect) Activator.CreateInstance(library.GetType(pluginType.ToString()));
-                                if (!m_plugineffects.ContainsKey(pluginType.Name))
-                                {
-                                    m_plugineffects.Add(pluginType.Name, terEffect);
-                                    m_log.Info("E ... " + pluginType.Name);
-                                }
-                                else
-                                {
-                                    m_log.Warn("E ... " + pluginType.Name + " (Already added)");
-                                }
+
+                                InstallPlugin(typeName, terEffect);
                             }
                             else if (pluginType.GetInterface("ITerrainLoader", false) != null)
                             {
                                 ITerrainLoader terLoader = (ITerrainLoader) Activator.CreateInstance(library.GetType(pluginType.ToString()));
                                 m_loaders[terLoader.FileExtension] = terLoader;
-                                m_log.Info("L ... " + pluginType.Name);
+                                m_log.Info("L ... " + typeName);
                             }
                         }
                         catch (AmbiguousMatchException)
@@ -273,6 +268,22 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain
             }
         }
 
+        public void InstallPlugin(string pluginName, ITerrainEffect effect)
+        {
+            lock (m_plugineffects)
+            {
+                if (!m_plugineffects.ContainsKey(pluginName))
+                {
+                    m_plugineffects.Add(pluginName, effect);
+                    m_log.Info("E ... " + pluginName);
+                }
+                else
+                {
+                    m_log.Warn("E ... " + pluginName + " (Skipping)");
+                }
+            }
+        }
+
         #endregion
 
         #endregion