diff options
author | Jonathan Freedman | 2010-10-02 19:17:02 -0400 |
---|---|---|
committer | Jonathan Freedman | 2010-10-02 19:17:02 -0400 |
commit | 32ccc7a9d912543c0a5d3f8db839734194f3d8dd (patch) | |
tree | 9822d8a2ea479b4a8d26ae7cc4df0124db201c56 /OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |
parent | So, the client can have an old idea of the object properties for the object w... (diff) | |
download | opensim-SC_OLD-32ccc7a9d912543c0a5d3f8db839734194f3d8dd.zip opensim-SC_OLD-32ccc7a9d912543c0a5d3f8db839734194f3d8dd.tar.gz opensim-SC_OLD-32ccc7a9d912543c0a5d3f8db839734194f3d8dd.tar.bz2 opensim-SC_OLD-32ccc7a9d912543c0a5d3f8db839734194f3d8dd.tar.xz |
* refactor refactor refactor ServerURI 4 lyfe
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 81f49b6..828c4e7 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -333,20 +333,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
333 | if (sp.ClientView.TryGet(out ipepClient)) | 333 | if (sp.ClientView.TryGet(out ipepClient)) |
334 | { | 334 | { |
335 | capsPath | 335 | capsPath |
336 | = "http://" | 336 | = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath); |
337 | + NetworkUtil.GetHostFor(ipepClient.EndPoint, finalDestination.ExternalHostName) | ||
338 | + ":" | ||
339 | + finalDestination.HttpPort | ||
340 | + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath); | ||
341 | } | 337 | } |
342 | else | 338 | else |
343 | { | 339 | { |
344 | capsPath | 340 | capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath); |
345 | = "http://" | ||
346 | + finalDestination.ExternalHostName | ||
347 | + ":" | ||
348 | + finalDestination.HttpPort | ||
349 | + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath); | ||
350 | } | 341 | } |
351 | #endregion | 342 | #endregion |
352 | 343 | ||
@@ -378,8 +369,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
378 | else | 369 | else |
379 | { | 370 | { |
380 | agentCircuit.CapsPath = sp.Scene.CapsModule.GetChildSeed(sp.UUID, reg.RegionHandle); | 371 | agentCircuit.CapsPath = sp.Scene.CapsModule.GetChildSeed(sp.UUID, reg.RegionHandle); |
381 | capsPath = "http://" + finalDestination.ExternalHostName + ":" + finalDestination.HttpPort | 372 | capsPath = finalDestination.ServerURI + "/CAPS/" + agentCircuit.CapsPath + "0000/"; |
382 | + "/CAPS/" + agentCircuit.CapsPath + "0000/"; | ||
383 | } | 373 | } |
384 | 374 | ||
385 | // Expect avatar crossing is a heavy-duty function at the destination. | 375 | // Expect avatar crossing is a heavy-duty function at the destination. |
@@ -512,8 +502,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
512 | 502 | ||
513 | protected virtual void SetCallbackURL(AgentData agent, RegionInfo region) | 503 | protected virtual void SetCallbackURL(AgentData agent, RegionInfo region) |
514 | { | 504 | { |
515 | agent.CallbackURI = "http://" + region.ExternalHostName + ":" + region.HttpPort + | 505 | agent.CallbackURI = region.ServerURI + "/agent/" + agent.AgentID.ToString() + "/" + region.RegionID.ToString() + "/release/"; |
516 | "/agent/" + agent.AgentID.ToString() + "/" + region.RegionID.ToString() + "/release/"; | ||
517 | 506 | ||
518 | } | 507 | } |
519 | 508 | ||
@@ -838,7 +827,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
838 | cAgent.Position = pos; | 827 | cAgent.Position = pos; |
839 | if (isFlying) | 828 | if (isFlying) |
840 | cAgent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY; | 829 | cAgent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY; |
841 | cAgent.CallbackURI = "http://" + m_scene.RegionInfo.ExternalHostName + ":" + m_scene.RegionInfo.HttpPort + | 830 | cAgent.CallbackURI = m_scene.RegionInfo.ServerURI + |
842 | "/agent/" + agent.UUID.ToString() + "/" + m_scene.RegionInfo.RegionID.ToString() + "/release/"; | 831 | "/agent/" + agent.UUID.ToString() + "/" + m_scene.RegionInfo.RegionID.ToString() + "/release/"; |
843 | 832 | ||
844 | if (!m_scene.SimulationService.UpdateAgent(neighbourRegion, cAgent)) | 833 | if (!m_scene.SimulationService.UpdateAgent(neighbourRegion, cAgent)) |
@@ -866,8 +855,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
866 | } | 855 | } |
867 | // TODO Should construct this behind a method | 856 | // TODO Should construct this behind a method |
868 | string capsPath = | 857 | string capsPath = |
869 | "http://" + neighbourRegion.ExternalHostName + ":" + neighbourRegion.HttpPort | 858 | neighbourRegion.ServerURI + "/CAPS/" + agentcaps /*circuitdata.CapsPath*/ + "0000/"; |
870 | + "/CAPS/" + agentcaps /*circuitdata.CapsPath*/ + "0000/"; | ||
871 | 859 | ||
872 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, agent.UUID); | 860 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, agent.UUID); |
873 | 861 | ||
@@ -1178,8 +1166,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1178 | y = y / Constants.RegionSize; | 1166 | y = y / Constants.RegionSize; |
1179 | m_log.Info("[ENTITY TRANSFER MODULE]: Starting to inform client about neighbour " + x + ", " + y + "(" + endPoint.ToString() + ")"); | 1167 | m_log.Info("[ENTITY TRANSFER MODULE]: Starting to inform client about neighbour " + x + ", " + y + "(" + endPoint.ToString() + ")"); |
1180 | 1168 | ||
1181 | string capsPath = "http://" + reg.ExternalHostName + ":" + reg.HttpPort | 1169 | string capsPath = reg.ServerURI + "/CAPS/" + a.CapsPath + "0000/"; |
1182 | + "/CAPS/" + a.CapsPath + "0000/"; | ||
1183 | 1170 | ||
1184 | string reason = String.Empty; | 1171 | string reason = String.Empty; |
1185 | 1172 | ||