Thanks, sempuki, for a patch that moves control of Mono.Addins from source attributes to external XML files. Fix issues 1682 and 1786.

2 files changed, 6 insertions, 10 deletions

diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index ebc6ac3..0b4b4ac 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -73,18 +73,18 @@ namespace OpenSim.Grid.GridServer
             provider = String.Join (".", s); 
 
             PluginLoader<IGridDataPlugin> gridloader = 
-                new PluginLoader<IGridDataPlugin> (new GridDataStoreInitialiser (connect));
+                new PluginLoader<IGridDataPlugin> (new GridDataInitialiser (connect));
 
             PluginLoader<ILogDataPlugin> logloader = 
                 new PluginLoader<ILogDataPlugin> (new LogDataInitialiser (connect));
 
-            gridloader.AddExtensionPoint ("/OpenSim/GridDataStore");
-            logloader.AddExtensionPoint ("/OpenSim/GridLogData");
+            gridloader.AddExtensionPoint ("/OpenSim/GridData");
+            logloader.AddExtensionPoint ("/OpenSim/LogData");
             
             // loader will try to load all providers (MySQL, MSSQL, etc) 
             // unless it is constrainted to the correct "id"
-            gridloader.AddFilter ("/OpenSim/GridDataStore", new PluginIdFilter (provider + "GridData"));
-            logloader.AddFilter ("/OpenSim/GridLogData", new PluginIdFilter (provider + "LogData"));
+            //gridloader.AddFilter ("/OpenSim/GridData", new PluginIdFilter (provider + "GridData"));
+            //logloader.AddFilter ("/OpenSim/LogData", new PluginIdFilter (provider + "LogData"));
             
             gridloader.Load();
             logloader.Load();
@@ -111,7 +111,7 @@ namespace OpenSim.Grid.GridServer
                 }
                 catch (Exception)
                 {
-                    m_log.Warn("[storage]: Unable to write log via ");
+                    m_log.Warn("[storage]: Unable to write log via " + plugin.Name);
                 }
             }
         }
diff --git a/OpenSim/Grid/GridServer/IGridPlugin.cs b/OpenSim/Grid/GridServer/IGridPlugin.cs
index 418caec..71c357b 100644
--- a/OpenSim/Grid/GridServer/IGridPlugin.cs
+++ b/OpenSim/Grid/GridServer/IGridPlugin.cs
@@ -26,14 +26,10 @@
 *
 */
 
-using Mono.Addins;
 using OpenSim.Framework;
 
-[assembly : AddinRoot("OpenSim.Grid.GridServer", "0.5")]
-
 namespace OpenSim.Grid.GridServer
 {
-    [TypeExtensionPoint("/OpenSim/GridServer")]
     public interface IGridPlugin : IPlugin
     {
         void Initialise(GridServerBase gridServer);