diff options
author | Mike Mazur | 2008-08-19 09:24:12 +0000 |
---|---|---|
committer | Mike Mazur | 2008-08-19 09:24:12 +0000 |
commit | 894f3045ed970cadcd421df2c3927f3e4160e91f (patch) | |
tree | 67bc2ce7914a367d967a60bb233eb21652e3ab63 /ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs | |
parent | Attachment persistence!!! Patch #9170 (Mantis #1171) (diff) | |
download | opensim-SC_OLD-894f3045ed970cadcd421df2c3927f3e4160e91f.zip opensim-SC_OLD-894f3045ed970cadcd421df2c3927f3e4160e91f.tar.gz opensim-SC_OLD-894f3045ed970cadcd421df2c3927f3e4160e91f.tar.bz2 opensim-SC_OLD-894f3045ed970cadcd421df2c3927f3e4160e91f.tar.xz |
Convert LoadBalancer and RegionProxy plugins to use XML manifests. Fixes
"Plugin Error: Node 'Type' not allowed" messages during region server startup.
Diffstat (limited to 'ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs')
-rw-r--r-- | ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs b/ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs index 7eefcf5..e65e7e5 100644 --- a/ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs +++ b/ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs | |||
@@ -37,9 +37,6 @@ using Nwc.XmlRpc; | |||
37 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
38 | using OpenSim.Framework.Servers; | 38 | using OpenSim.Framework.Servers; |
39 | 39 | ||
40 | [assembly : Addin("RegionProxy", "0.1")] | ||
41 | [assembly : AddinDependency("OpenSim", "0.5")] | ||
42 | |||
43 | namespace OpenSim.ApplicationPlugins.RegionProxy | 40 | namespace OpenSim.ApplicationPlugins.RegionProxy |
44 | { | 41 | { |
45 | /* This module has an interface to OpenSim clients that is constant, and is responsible for relaying | 42 | /* This module has an interface to OpenSim clients that is constant, and is responsible for relaying |
@@ -60,7 +57,6 @@ namespace OpenSim.ApplicationPlugins.RegionProxy | |||
60 | * - UnblockClientMessages | 57 | * - UnblockClientMessages |
61 | */ | 58 | */ |
62 | 59 | ||
63 | [Extension("/OpenSim/Startup")] | ||
64 | public class RegionProxyPlugin : IApplicationPlugin | 60 | public class RegionProxyPlugin : IApplicationPlugin |
65 | { | 61 | { |
66 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 62 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
@@ -69,8 +65,8 @@ namespace OpenSim.ApplicationPlugins.RegionProxy | |||
69 | 65 | ||
70 | #region IApplicationPlugin Members | 66 | #region IApplicationPlugin Members |
71 | // TODO: required by IPlugin, but likely not at all right | 67 | // TODO: required by IPlugin, but likely not at all right |
72 | string m_name = "RegionProxyPlugin"; | 68 | string m_name = "RegionProxy"; |
73 | string m_version = "0.0"; | 69 | string m_version = "0.1"; |
74 | 70 | ||
75 | public string Version { get { return m_version; } } | 71 | public string Version { get { return m_version; } } |
76 | public string Name { get { return m_name; } } | 72 | public string Name { get { return m_name; } } |
@@ -83,7 +79,7 @@ namespace OpenSim.ApplicationPlugins.RegionProxy | |||
83 | 79 | ||
84 | public void Initialise(OpenSimBase openSim) | 80 | public void Initialise(OpenSimBase openSim) |
85 | { | 81 | { |
86 | m_log.Info("Starting proxy"); | 82 | m_log.Info("[PROXY] Starting proxy"); |
87 | string proxyURL = openSim.ConfigSource.Source.Configs["Network"].GetString("proxy_url", ""); | 83 | string proxyURL = openSim.ConfigSource.Source.Configs["Network"].GetString("proxy_url", ""); |
88 | if (proxyURL.Length == 0) return; | 84 | if (proxyURL.Length == 0) return; |
89 | 85 | ||