diff options
author | Charles Krinke | 2008-06-27 02:15:57 +0000 |
---|---|---|
committer | Charles Krinke | 2008-06-27 02:15:57 +0000 |
commit | ca8d1d57e1bbf49cb52abe81b3a7246dacbe9b03 (patch) | |
tree | 97f8cce96ea2e98b96b36e523c59361bf00f63b8 /ThirdParty/3Di | |
parent | Mantis#1610. Thank you, Melanie for a patch that: (diff) | |
download | opensim-SC-ca8d1d57e1bbf49cb52abe81b3a7246dacbe9b03.zip opensim-SC-ca8d1d57e1bbf49cb52abe81b3a7246dacbe9b03.tar.gz opensim-SC-ca8d1d57e1bbf49cb52abe81b3a7246dacbe9b03.tar.bz2 opensim-SC-ca8d1d57e1bbf49cb52abe81b3a7246dacbe9b03.tar.xz |
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.
Diffstat (limited to 'ThirdParty/3Di')
-rw-r--r-- | ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs | 14 | ||||
-rw-r--r-- | ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs | 14 |
2 files changed, 26 insertions, 2 deletions
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 | |||
74 | private List<IClientNetworkServer> m_clientServers; | 74 | private List<IClientNetworkServer> m_clientServers; |
75 | 75 | ||
76 | #region IApplicationPlugin Members | 76 | #region IApplicationPlugin Members |
77 | // TODO: required by IPlugin, but likely not at all right | ||
78 | string m_name = "LoadBalancerPlugin"; | ||
79 | string m_version = "0.0"; | ||
80 | |||
81 | public string Version { get { return m_version; } } | ||
82 | public string Name { get { return m_name; } } | ||
83 | |||
84 | public void Initialise() | ||
85 | { | ||
86 | m_log.Info("[BALANCER]: " + Name + " cannot be default-initialized!"); | ||
87 | throw new PluginNotInitialisedException (Name); | ||
88 | } | ||
77 | 89 | ||
78 | public void Initialise(OpenSimBase openSim) | 90 | public void Initialise(OpenSimBase openSim) |
79 | { | 91 | { |
@@ -109,7 +121,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer | |||
109 | m_log.Info("[BALANCER] " + "Exiting Initialize()"); | 121 | m_log.Info("[BALANCER] " + "Exiting Initialize()"); |
110 | } | 122 | } |
111 | 123 | ||
112 | public void Close() | 124 | public void Dispose() |
113 | { | 125 | { |
114 | } | 126 | } |
115 | 127 | ||
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 | |||
68 | private ProxyServer proxy; | 68 | private ProxyServer proxy; |
69 | 69 | ||
70 | #region IApplicationPlugin Members | 70 | #region IApplicationPlugin Members |
71 | // TODO: required by IPlugin, but likely not at all right | ||
72 | string m_name = "RegionProxyPlugin"; | ||
73 | string m_version = "0.0"; | ||
74 | |||
75 | public string Version { get { return m_version; } } | ||
76 | public string Name { get { return m_name; } } | ||
77 | |||
78 | public void Initialise() | ||
79 | { | ||
80 | m_log.Info("[PROXY]: " + Name + " cannot be default-initialized!"); | ||
81 | throw new PluginNotInitialisedException (Name); | ||
82 | } | ||
71 | 83 | ||
72 | public void Initialise(OpenSimBase openSim) | 84 | public void Initialise(OpenSimBase openSim) |
73 | { | 85 | { |
@@ -89,7 +101,7 @@ namespace OpenSim.ApplicationPlugins.RegionProxy | |||
89 | proxy = new ProxyServer(m_log); | 101 | proxy = new ProxyServer(m_log); |
90 | } | 102 | } |
91 | 103 | ||
92 | public void Close() | 104 | public void Dispose() |
93 | { | 105 | { |
94 | } | 106 | } |
95 | 107 | ||