aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/GridServer
diff options
context:
space:
mode:
authorCharles Krinke2008-07-11 02:04:02 +0000
committerCharles Krinke2008-07-11 02:04:02 +0000
commitcda526939145d92794eb14554ef43badaf06c149 (patch)
treeb152e13ae8925f5d7ec850bdfac847a0fe472ab9 /OpenSim/Grid/GridServer
parentMantis#1541. Thank you kindly, Phrearch for a patch that: (diff)
downloadopensim-SC_OLD-cda526939145d92794eb14554ef43badaf06c149.zip
opensim-SC_OLD-cda526939145d92794eb14554ef43badaf06c149.tar.gz
opensim-SC_OLD-cda526939145d92794eb14554ef43badaf06c149.tar.bz2
opensim-SC_OLD-cda526939145d92794eb14554ef43badaf06c149.tar.xz
Mantis#1682. Revert temporarily, Sempuki's mono addins patch
while he studies the issues in Windows a little bit.
Diffstat (limited to 'OpenSim/Grid/GridServer')
-rw-r--r--OpenSim/Grid/GridServer/GridServerBase.cs3
-rw-r--r--OpenSim/Grid/GridServer/IGridPlugin.cs4
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;
31using System.Reflection; 31using System.Reflection;
32using System.Timers; 32using System.Timers;
33using log4net; 33using log4net;
34using Mono.Addins;
34using OpenSim.Framework; 35using OpenSim.Framework;
35using OpenSim.Framework.Console; 36using OpenSim.Framework.Console;
36using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
@@ -120,7 +121,7 @@ namespace OpenSim.Grid.GridServer
120 PluginLoader<IGridPlugin> loader = 121 PluginLoader<IGridPlugin> loader =
121 new PluginLoader<IGridPlugin> (new GridPluginInitialiser (this)); 122 new PluginLoader<IGridPlugin> (new GridPluginInitialiser (this));
122 123
123 loader.Load ("/OpenSim/GridServer"); 124 loader.Load ("/OpenSim/GridServer", ".");
124 m_plugins = loader.Plugins; 125 m_plugins = loader.Plugins;
125 } 126 }
126 127
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 @@
26* 26*
27*/ 27*/
28 28
29using Mono.Addins;
29using OpenSim.Framework; 30using OpenSim.Framework;
30 31
32[assembly : AddinRoot("OpenSim", "0.5")]
33
31namespace OpenSim.Grid.GridServer 34namespace OpenSim.Grid.GridServer
32{ 35{
36 [TypeExtensionPoint("/OpenSim/GridServer")]
33 public interface IGridPlugin : IPlugin 37 public interface IGridPlugin : IPlugin
34 { 38 {
35 void Initialise(GridServerBase gridServer); 39 void Initialise(GridServerBase gridServer);