aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
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/Region
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/Region')
-rw-r--r--OpenSim/Region/Application/IApplicationPlugin.cs4
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs4
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 @@
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;
28using OpenSim.Framework; 29using OpenSim.Framework;
29 30
31[assembly : AddinRoot("OpenSim", "0.5")]
32
30namespace OpenSim 33namespace OpenSim
31{ 34{
35 [TypeExtensionPoint("/OpenSim/Startup")]
32 public interface IApplicationPlugin : IPlugin 36 public interface IApplicationPlugin : IPlugin
33 { 37 {
34 void Initialise(OpenSimBase openSim); 38 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;
34using System.Threading; 34using System.Threading;
35using libsecondlife; 35using libsecondlife;
36using log4net; 36using log4net;
37using Mono.Addins;
37using Nini.Config; 38using Nini.Config;
38using OpenSim.Framework; 39using OpenSim.Framework;
39using OpenSim.Framework.Communications.Cache; 40using OpenSim.Framework.Communications.Cache;
@@ -336,7 +337,7 @@ namespace OpenSim
336 PluginLoader<IApplicationPlugin> loader = 337 PluginLoader<IApplicationPlugin> loader =
337 new PluginLoader<IApplicationPlugin> (new ApplicationPluginInitialiser (this)); 338 new PluginLoader<IApplicationPlugin> (new ApplicationPluginInitialiser (this));
338 339
339 loader.Load ("/OpenSim/Startup"); 340 loader.Load ("/OpenSim/Startup", ".");
340 m_plugins = loader.Plugins; 341 m_plugins = loader.Plugins;
341 } 342 }
342 343
@@ -729,4 +730,3 @@ namespace OpenSim
729 730
730 731
731 732
732