Mantis#1682. Revert temporarily, Sempuki's mono addins patch

while he studies the issues in Windows a little bit.

2 files changed, 6 insertions, 1 deletions

diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index a8ebd27..3cd7489 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -31,6 +31,7 @@ using System.IO;
 using System.Reflection;
 using System.Timers;
 using log4net;
+using Mono.Addins;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
@@ -120,7 +121,7 @@ namespace OpenSim.Grid.GridServer
             PluginLoader<IGridPlugin> loader = 
                 new PluginLoader<IGridPlugin> (new GridPluginInitialiser (this));
 
-            loader.Load ("/OpenSim/GridServer");
+            loader.Load ("/OpenSim/GridServer", ".");
             m_plugins = loader.Plugins;
         }
 
diff --git a/OpenSim/Grid/GridServer/IGridPlugin.cs b/OpenSim/Grid/GridServer/IGridPlugin.cs
index b8ac611..6593962 100644
--- a/OpenSim/Grid/GridServer/IGridPlugin.cs
+++ b/OpenSim/Grid/GridServer/IGridPlugin.cs
@@ -26,10 +26,14 @@
 *
 */
 
+using Mono.Addins;
 using OpenSim.Framework;
 
+[assembly : AddinRoot("OpenSim", "0.5")]
+
 namespace OpenSim.Grid.GridServer
 {
+    [TypeExtensionPoint("/OpenSim/GridServer")]
     public interface IGridPlugin : IPlugin
     {
         void Initialise(GridServerBase gridServer);