diff options
author | BlueWall (James Hughes) | 2009-09-18 16:32:46 -0400 |
---|---|---|
committer | Melanie | 2009-09-19 08:16:10 +0100 |
commit | d835485a1fac7594f30ebc3a648eb70dcc2c20d8 (patch) | |
tree | e8dcace306ec6fbdf17e240a6a4cb1276c7b16ea /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |
parent | First pass at LocalGridServiceConnector. Nothing of this is used by the simul... (diff) | |
download | opensim-SC_OLD-d835485a1fac7594f30ebc3a648eb70dcc2c20d8.zip opensim-SC_OLD-d835485a1fac7594f30ebc3a648eb70dcc2c20d8.tar.gz opensim-SC_OLD-d835485a1fac7594f30ebc3a648eb70dcc2c20d8.tar.bz2 opensim-SC_OLD-d835485a1fac7594f30ebc3a648eb70dcc2c20d8.tar.xz |
Updatate llOpenRemoteDataChannel to provide the external hostname configured in the Regions.ini (or xml) to the XmlRpcGridRouterModule
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index ba42678..02be983 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -6321,9 +6321,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6321 | UUID channelID = xmlrpcMod.OpenXMLRPCChannel(m_localID, m_itemID, UUID.Zero); | 6321 | UUID channelID = xmlrpcMod.OpenXMLRPCChannel(m_localID, m_itemID, UUID.Zero); |
6322 | IXmlRpcRouter xmlRpcRouter = m_ScriptEngine.World.RequestModuleInterface<IXmlRpcRouter>(); | 6322 | IXmlRpcRouter xmlRpcRouter = m_ScriptEngine.World.RequestModuleInterface<IXmlRpcRouter>(); |
6323 | if (xmlRpcRouter != null) | 6323 | if (xmlRpcRouter != null) |
6324 | { | ||
6325 | string ExternalHostName = m_ScriptEngine.World.RegionInfo.ExternalHostName; | ||
6326 | |||
6324 | xmlRpcRouter.RegisterNewReceiver(m_ScriptEngine.ScriptModule, channelID, m_host.UUID, | 6327 | xmlRpcRouter.RegisterNewReceiver(m_ScriptEngine.ScriptModule, channelID, m_host.UUID, |
6325 | m_itemID, String.Format("http://{0}:{1}/", System.Environment.MachineName, | 6328 | m_itemID, String.Format("http://{0}:{1}/", ExternalHostName, |
6326 | xmlrpcMod.Port.ToString())); | 6329 | xmlrpcMod.Port.ToString())); |
6330 | } | ||
6327 | object[] resobj = new object[] | 6331 | object[] resobj = new object[] |
6328 | { | 6332 | { |
6329 | new LSL_Integer(1), | 6333 | new LSL_Integer(1), |