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

while he studies the issues in Windows a little bit.

2 files changed, 6 insertions, 2 deletions

diff --git a/OpenSim/Region/Application/IApplicationPlugin.cs b/OpenSim/Region/Application/IApplicationPlugin.cs
index 2e3122f..f122925 100644
--- a/OpenSim/Region/Application/IApplicationPlugin.cs
+++ b/OpenSim/Region/Application/IApplicationPlugin.cs
@@ -25,10 +25,14 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using Mono.Addins;
 using OpenSim.Framework;
 
+[assembly : AddinRoot("OpenSim", "0.5")]
+
 namespace OpenSim
 {
+    [TypeExtensionPoint("/OpenSim/Startup")]
     public interface IApplicationPlugin : IPlugin
     {
         void Initialise(OpenSimBase openSim);
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 065d2f2..37daf88 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -34,6 +34,7 @@ using System.Text;
 using System.Threading;
 using libsecondlife;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
@@ -336,7 +337,7 @@ namespace OpenSim
             PluginLoader<IApplicationPlugin> loader = 
                 new PluginLoader<IApplicationPlugin> (new ApplicationPluginInitialiser (this));
 
-            loader.Load ("/OpenSim/Startup");
+            loader.Load ("/OpenSim/Startup", ".");
             m_plugins = loader.Plugins;
         }
 
@@ -729,4 +730,3 @@ namespace OpenSim
 
 
 
-