diff options
Revert "Updates all IRegionModules to the new style region modules."
This reverts commit ec3c31e61e5e540f822891110df9bc978655bbaf.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs index f2a0e53..d18ac0a 100644 --- a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs | |||
@@ -30,7 +30,6 @@ using System.Collections.Generic; | |||
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | 31 | ||
32 | using log4net; | 32 | using log4net; |
33 | using Mono.Addins; | ||
34 | using Nini.Config; | 33 | using Nini.Config; |
35 | using OpenMetaverse; | 34 | using OpenMetaverse; |
36 | 35 | ||
@@ -50,8 +49,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcGridRouterModule | |||
50 | public string uri; | 49 | public string uri; |
51 | } | 50 | } |
52 | 51 | ||
53 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 52 | public class XmlRpcGridRouter : IRegionModule, IXmlRpcRouter |
54 | public class XmlRpcGridRouter : INonSharedRegionModule, IXmlRpcRouter | ||
55 | { | 53 | { |
56 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 54 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
57 | 55 | ||
@@ -61,7 +59,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcGridRouterModule | |||
61 | private bool m_Enabled = false; | 59 | private bool m_Enabled = false; |
62 | private string m_ServerURI = String.Empty; | 60 | private string m_ServerURI = String.Empty; |
63 | 61 | ||
64 | public void Initialise(IConfigSource config) | 62 | public void Initialise(Scene scene, IConfigSource config) |
65 | { | 63 | { |
66 | IConfig startupConfig = config.Configs["Startup"]; | 64 | IConfig startupConfig = config.Configs["Startup"]; |
67 | if (startupConfig == null) | 65 | if (startupConfig == null) |
@@ -77,26 +75,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcGridRouterModule | |||
77 | return; | 75 | return; |
78 | } | 76 | } |
79 | 77 | ||
78 | scene.RegisterModuleInterface<IXmlRpcRouter>(this); | ||
80 | m_Enabled = true; | 79 | m_Enabled = true; |
81 | } | 80 | } |
82 | } | 81 | } |
83 | 82 | ||
84 | public void AddRegion(Scene scene) | 83 | public void PostInitialise() |
85 | { | 84 | { |
86 | scene.RegisterModuleInterface<IXmlRpcRouter>(this); | ||
87 | } | ||
88 | public void RegionLoaded(Scene scene) | ||
89 | { | ||
90 | } | ||
91 | |||
92 | public void RemoveRegion(Scene scene) | ||
93 | { | ||
94 | scene.UnregisterModuleInterface<IXmlRpcRouter>(this); | ||
95 | } | ||
96 | |||
97 | public Type ReplaceableInterface | ||
98 | { | ||
99 | get { return null; } | ||
100 | } | 85 | } |
101 | 86 | ||
102 | public void Close() | 87 | public void Close() |
@@ -108,6 +93,11 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcGridRouterModule | |||
108 | get { return "XmlRpcGridRouterModule"; } | 93 | get { return "XmlRpcGridRouterModule"; } |
109 | } | 94 | } |
110 | 95 | ||
96 | public bool IsSharedModule | ||
97 | { | ||
98 | get { return false; } | ||
99 | } | ||
100 | |||
111 | public void RegisterNewReceiver(IScriptModule scriptEngine, UUID channel, UUID objectID, UUID itemID, string uri) | 101 | public void RegisterNewReceiver(IScriptModule scriptEngine, UUID channel, UUID objectID, UUID itemID, string uri) |
112 | { | 102 | { |
113 | if (!m_Channels.ContainsKey(itemID)) | 103 | if (!m_Channels.ContainsKey(itemID)) |