aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorCharles Krinke2008-07-10 13:45:46 +0000
committerCharles Krinke2008-07-10 13:45:46 +0000
commit7fd63d9dc84cce5a6e6b177ff3b62598b08978f4 (patch)
tree22e18ec3c23e6d7d9ee4cc9b9b39609974651df7 /OpenSim/Region
parentThanks to mikem for a patch that resolves a reference error when building SVN... (diff)
downloadopensim-SC_OLD-7fd63d9dc84cce5a6e6b177ff3b62598b08978f4.zip
opensim-SC_OLD-7fd63d9dc84cce5a6e6b177ff3b62598b08978f4.tar.gz
opensim-SC_OLD-7fd63d9dc84cce5a6e6b177ff3b62598b08978f4.tar.bz2
opensim-SC_OLD-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 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/IApplicationPlugin.cs4
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs4
2 files changed, 2 insertions, 6 deletions
diff --git a/OpenSim/Region/Application/IApplicationPlugin.cs b/OpenSim/Region/Application/IApplicationPlugin.cs
index f122925..2e3122f 100644
--- a/OpenSim/Region/Application/IApplicationPlugin.cs
+++ b/OpenSim/Region/Application/IApplicationPlugin.cs
@@ -25,14 +25,10 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using Mono.Addins;
29using OpenSim.Framework; 28using OpenSim.Framework;
30 29
31[assembly : AddinRoot("OpenSim", "0.5")]
32
33namespace OpenSim 30namespace OpenSim
34{ 31{
35 [TypeExtensionPoint("/OpenSim/Startup")]
36 public interface IApplicationPlugin : IPlugin 32 public interface IApplicationPlugin : IPlugin
37 { 33 {
38 void Initialise(OpenSimBase openSim); 34 void Initialise(OpenSimBase openSim);
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 37daf88..065d2f2 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -34,7 +34,6 @@ using System.Text;
34using System.Threading; 34using System.Threading;
35using libsecondlife; 35using libsecondlife;
36using log4net; 36using log4net;
37using Mono.Addins;
38using Nini.Config; 37using Nini.Config;
39using OpenSim.Framework; 38using OpenSim.Framework;
40using OpenSim.Framework.Communications.Cache; 39using OpenSim.Framework.Communications.Cache;
@@ -337,7 +336,7 @@ namespace OpenSim
337 PluginLoader<IApplicationPlugin> loader = 336 PluginLoader<IApplicationPlugin> loader =
338 new PluginLoader<IApplicationPlugin> (new ApplicationPluginInitialiser (this)); 337 new PluginLoader<IApplicationPlugin> (new ApplicationPluginInitialiser (this));
339 338
340 loader.Load ("/OpenSim/Startup", "."); 339 loader.Load ("/OpenSim/Startup");
341 m_plugins = loader.Plugins; 340 m_plugins = loader.Plugins;
342 } 341 }
343 342
@@ -730,3 +729,4 @@ namespace OpenSim
730 729
731 730
732 731
732