diff options
author | onefang | 2019-05-19 21:24:15 +1000 |
---|---|---|
committer | onefang | 2019-05-19 21:24:15 +1000 |
commit | 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb (patch) | |
tree | a9fbc62df9eb2d1d9ba2698d8552eae71eca20d8 /OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule | |
parent | Add a build script. (diff) | |
download | opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.zip opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.gz opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.bz2 opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.xz |
Dump OpenSim 0.9.0.1 into it's own branch.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs index 744d1e3..bf33996 100644 --- a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs | |||
@@ -54,7 +54,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcGridRouterModule | |||
54 | public class XmlRpcGridRouter : INonSharedRegionModule, IXmlRpcRouter | 54 | public class XmlRpcGridRouter : INonSharedRegionModule, IXmlRpcRouter |
55 | { | 55 | { |
56 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 56 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
57 | 57 | ||
58 | private Dictionary<UUID, UUID> m_Channels = | 58 | private Dictionary<UUID, UUID> m_Channels = |
59 | new Dictionary<UUID, UUID>(); | 59 | new Dictionary<UUID, UUID>(); |
60 | 60 | ||
@@ -94,7 +94,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcGridRouterModule | |||
94 | { | 94 | { |
95 | scriptEngine.OnScriptRemoved += this.ScriptRemoved; | 95 | scriptEngine.OnScriptRemoved += this.ScriptRemoved; |
96 | scriptEngine.OnObjectRemoved += this.ObjectRemoved; | 96 | scriptEngine.OnObjectRemoved += this.ObjectRemoved; |
97 | 97 | ||
98 | } | 98 | } |
99 | } | 99 | } |
100 | 100 | ||
@@ -131,7 +131,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcGridRouterModule | |||
131 | if (!m_Enabled) | 131 | if (!m_Enabled) |
132 | return; | 132 | return; |
133 | 133 | ||
134 | m_log.InfoFormat("[XMLRPC GRID ROUTER]: New receiver Obj: {0} Ch: {1} ID: {2} URI: {3}", | 134 | m_log.InfoFormat("[XMLRPC GRID ROUTER]: New receiver Obj: {0} Ch: {1} ID: {2} URI: {3}", |
135 | objectID.ToString(), channel.ToString(), itemID.ToString(), uri); | 135 | objectID.ToString(), channel.ToString(), itemID.ToString(), uri); |
136 | 136 | ||
137 | XmlRpcInfo info = new XmlRpcInfo(); | 137 | XmlRpcInfo info = new XmlRpcInfo(); |
@@ -178,7 +178,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcGridRouterModule | |||
178 | { | 178 | { |
179 | if(!m_Channels.ContainsKey(itemID)) | 179 | if(!m_Channels.ContainsKey(itemID)) |
180 | { | 180 | { |
181 | m_log.InfoFormat("[XMLRPC GRID ROUTER]: Attempted to unregister non-existing Item: {0}", itemID.ToString()); | 181 | //m_log.InfoFormat("[XMLRPC GRID ROUTER]: Attempted to unregister non-existing Item: {0}", itemID.ToString()); |
182 | return false; | 182 | return false; |
183 | } | 183 | } |
184 | 184 | ||
diff --git a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs index 943675e..32549d6 100644 --- a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs | |||
@@ -98,7 +98,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcRouterModule | |||
98 | 98 | ||
99 | public void RegisterNewReceiver(IScriptModule scriptEngine, UUID channel, UUID objectID, UUID itemID, string uri) | 99 | public void RegisterNewReceiver(IScriptModule scriptEngine, UUID channel, UUID objectID, UUID itemID, string uri) |
100 | { | 100 | { |
101 | scriptEngine.PostScriptEvent(itemID, "xmlrpc_uri", new Object[] {uri}); | 101 | if (m_Enabled) |
102 | { | ||
103 | scriptEngine.PostScriptEvent(itemID, "xmlrpc_uri", new Object[] { uri }); | ||
104 | } | ||
102 | } | 105 | } |
103 | 106 | ||
104 | public void UnRegisterReceiver(string channelID, UUID itemID) | 107 | public void UnRegisterReceiver(string channelID, UUID itemID) |