From ca8d1d57e1bbf49cb52abe81b3a7246dacbe9b03 Mon Sep 17 00:00:00 2001 From: Charles Krinke Date: Fri, 27 Jun 2008 02:15:57 +0000 Subject: Mantis#1591. Thank you graciously, Sempuki for a patch that: Currently module loading is done ad-hoc. I propose creating a simple loader class that leverages Mono.Addins (and perhaps the new .NET addins when they become available in mono). Attached is a basic patch for review that compiles into HEAD, but doesn't yet replace any existing ad-hoc loaders. --- ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs | 14 +++++++++++++- ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs | 14 +++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) (limited to 'ThirdParty') diff --git a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs index 2aa2398..625e3c5 100644 --- a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs +++ b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs @@ -74,6 +74,18 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer private List m_clientServers; #region IApplicationPlugin Members + // TODO: required by IPlugin, but likely not at all right + string m_name = "LoadBalancerPlugin"; + string m_version = "0.0"; + + public string Version { get { return m_version; } } + public string Name { get { return m_name; } } + + public void Initialise() + { + m_log.Info("[BALANCER]: " + Name + " cannot be default-initialized!"); + throw new PluginNotInitialisedException (Name); + } public void Initialise(OpenSimBase openSim) { @@ -109,7 +121,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer m_log.Info("[BALANCER] " + "Exiting Initialize()"); } - public void Close() + public void Dispose() { } diff --git a/ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs b/ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs index 9bb883e..a3108f6 100644 --- a/ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs +++ b/ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs @@ -68,6 +68,18 @@ namespace OpenSim.ApplicationPlugins.RegionProxy private ProxyServer proxy; #region IApplicationPlugin Members + // TODO: required by IPlugin, but likely not at all right + string m_name = "RegionProxyPlugin"; + string m_version = "0.0"; + + public string Version { get { return m_version; } } + public string Name { get { return m_name; } } + + public void Initialise() + { + m_log.Info("[PROXY]: " + Name + " cannot be default-initialized!"); + throw new PluginNotInitialisedException (Name); + } public void Initialise(OpenSimBase openSim) { @@ -89,7 +101,7 @@ namespace OpenSim.ApplicationPlugins.RegionProxy proxy = new ProxyServer(m_log); } - public void Close() + public void Dispose() { } -- cgit v1.1