diff options
author | Charles Krinke | 2008-07-10 13:45:46 +0000 |
---|---|---|
committer | Charles Krinke | 2008-07-10 13:45:46 +0000 |
commit | 7fd63d9dc84cce5a6e6b177ff3b62598b08978f4 (patch) | |
tree | 22e18ec3c23e6d7d9ee4cc9b9b39609974651df7 /OpenSim/Grid/GridServer | |
parent | Thanks to mikem for a patch that resolves a reference error when building SVN... (diff) | |
download | opensim-SC-7fd63d9dc84cce5a6e6b177ff3b62598b08978f4.zip opensim-SC-7fd63d9dc84cce5a6e6b177ff3b62598b08978f4.tar.gz opensim-SC-7fd63d9dc84cce5a6e6b177ff3b62598b08978f4.tar.bz2 opensim-SC-7fd63d9dc84cce5a6e6b177ff3b62598b08978f4.tar.xz |
Mantis#1682. Thank you kindly, Sempuki for a patch that:
Move control of Mono.Addins from source attributes to external XML files.
This removes a lot of coupling of the source with Mono.Addins
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/GridServer/GridServerBase.cs | 3 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/IGridPlugin.cs | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs index 3cd7489..a8ebd27 100644 --- a/OpenSim/Grid/GridServer/GridServerBase.cs +++ b/OpenSim/Grid/GridServer/GridServerBase.cs | |||
@@ -31,7 +31,6 @@ using System.IO; | |||
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using System.Timers; | 32 | using System.Timers; |
33 | using log4net; | 33 | using log4net; |
34 | using Mono.Addins; | ||
35 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
36 | using OpenSim.Framework.Console; | 35 | using OpenSim.Framework.Console; |
37 | using OpenSim.Framework.Servers; | 36 | using OpenSim.Framework.Servers; |
@@ -121,7 +120,7 @@ namespace OpenSim.Grid.GridServer | |||
121 | PluginLoader<IGridPlugin> loader = | 120 | PluginLoader<IGridPlugin> loader = |
122 | new PluginLoader<IGridPlugin> (new GridPluginInitialiser (this)); | 121 | new PluginLoader<IGridPlugin> (new GridPluginInitialiser (this)); |
123 | 122 | ||
124 | loader.Load ("/OpenSim/GridServer", "."); | 123 | loader.Load ("/OpenSim/GridServer"); |
125 | m_plugins = loader.Plugins; | 124 | m_plugins = loader.Plugins; |
126 | } | 125 | } |
127 | 126 | ||
diff --git a/OpenSim/Grid/GridServer/IGridPlugin.cs b/OpenSim/Grid/GridServer/IGridPlugin.cs index 6593962..b8ac611 100644 --- a/OpenSim/Grid/GridServer/IGridPlugin.cs +++ b/OpenSim/Grid/GridServer/IGridPlugin.cs | |||
@@ -26,14 +26,10 @@ | |||
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | 28 | ||
29 | using Mono.Addins; | ||
30 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
31 | 30 | ||
32 | [assembly : AddinRoot("OpenSim", "0.5")] | ||
33 | |||
34 | namespace OpenSim.Grid.GridServer | 31 | namespace OpenSim.Grid.GridServer |
35 | { | 32 | { |
36 | [TypeExtensionPoint("/OpenSim/GridServer")] | ||
37 | public interface IGridPlugin : IPlugin | 33 | public interface IGridPlugin : IPlugin |
38 | { | 34 | { |
39 | void Initialise(GridServerBase gridServer); | 35 | void Initialise(GridServerBase gridServer); |