aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2009-09-19 07:37:19 -0700
committerDiva Canto2009-09-19 07:37:19 -0700
commit462e3a44642d70a909016ce71445bb63e6abed49 (patch)
treec95f0b5be466618de0b374b4f8689da607d83528
parentReverted the order of reading configs in GridServiceBase. (diff)
parentUpdatate llOpenRemoteDataChannel to provide the external hostname configured ... (diff)
downloadopensim-SC_OLD-462e3a44642d70a909016ce71445bb63e6abed49.zip
opensim-SC_OLD-462e3a44642d70a909016ce71445bb63e6abed49.tar.gz
opensim-SC_OLD-462e3a44642d70a909016ce71445bb63e6abed49.tar.bz2
opensim-SC_OLD-462e3a44642d70a909016ce71445bb63e6abed49.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs6
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),