diff options
author | Jonathan Freedman | 2010-10-02 19:17:02 -0400 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2010-10-20 22:21:23 -0400 |
commit | 55974df14b6d64c1e1f9e386a3eacce3ba86dc98 (patch) | |
tree | 1695b00c4f523f2588b15051b0cfe919d14989e8 /OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |
parent | Deleted verbose debug messages that are bringing sims to an halt. Increased t... (diff) | |
download | opensim-SC_OLD-55974df14b6d64c1e1f9e386a3eacce3ba86dc98.zip opensim-SC_OLD-55974df14b6d64c1e1f9e386a3eacce3ba86dc98.tar.gz opensim-SC_OLD-55974df14b6d64c1e1f9e386a3eacce3ba86dc98.tar.bz2 opensim-SC_OLD-55974df14b6d64c1e1f9e386a3eacce3ba86dc98.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 38fff1c..3791e1d 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -337,20 +337,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
337 | if (sp.ClientView.TryGet(out ipepClient)) | 337 | if (sp.ClientView.TryGet(out ipepClient)) |
338 | { | 338 | { |
339 | capsPath | 339 | capsPath |
340 | = "http://" | 340 | = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath); |
341 | + NetworkUtil.GetHostFor(ipepClient.EndPoint, finalDestination.ExternalHostName) | ||
342 | + ":" | ||
343 | + finalDestination.HttpPort | ||
344 | + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath); | ||
345 | } | 341 | } |
346 | else | 342 | else |
347 | { | 343 | { |
348 | capsPath | 344 | capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath); |
349 | = "http://" | ||
350 | + finalDestination.ExternalHostName | ||
351 | + ":" | ||
352 | + finalDestination.HttpPort | ||
353 | + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath); | ||
354 | } | 345 | } |
355 | #endregion | 346 | #endregion |
356 | 347 | ||
@@ -382,8 +373,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
382 | else | 373 | else |
383 | { | 374 | { |
384 | agentCircuit.CapsPath = sp.Scene.CapsModule.GetChildSeed(sp.UUID, reg.RegionHandle); | 375 | agentCircuit.CapsPath = sp.Scene.CapsModule.GetChildSeed(sp.UUID, reg.RegionHandle); |
385 | capsPath = "http://" + finalDestination.ExternalHostName + ":" + finalDestination.HttpPort | 376 | capsPath = finalDestination.ServerURI + "/CAPS/" + agentCircuit.CapsPath + "0000/"; |
386 | + "/CAPS/" + agentCircuit.CapsPath + "0000/"; | ||
387 | } | 377 | } |
388 | 378 | ||
389 | // Expect avatar crossing is a heavy-duty function at the destination. | 379 | // Expect avatar crossing is a heavy-duty function at the destination. |
@@ -516,8 +506,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
516 | 506 | ||
517 | protected virtual void SetCallbackURL(AgentData agent, RegionInfo region) | 507 | protected virtual void SetCallbackURL(AgentData agent, RegionInfo region) |
518 | { | 508 | { |
519 | agent.CallbackURI = "http://" + region.ExternalHostName + ":" + region.HttpPort + | 509 | agent.CallbackURI = region.ServerURI + "/agent/" + agent.AgentID.ToString() + "/" + region.RegionID.ToString() + "/release/"; |
520 | "/agent/" + agent.AgentID.ToString() + "/" + region.RegionID.ToString() + "/release/"; | ||
521 | 510 | ||
522 | } | 511 | } |
523 | 512 | ||
@@ -842,7 +831,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
842 | cAgent.Position = pos; | 831 | cAgent.Position = pos; |
843 | if (isFlying) | 832 | if (isFlying) |
844 | cAgent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY; | 833 | cAgent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY; |
845 | cAgent.CallbackURI = "http://" + m_scene.RegionInfo.ExternalHostName + ":" + m_scene.RegionInfo.HttpPort + | 834 | cAgent.CallbackURI = m_scene.RegionInfo.ServerURI + |
846 | "/agent/" + agent.UUID.ToString() + "/" + m_scene.RegionInfo.RegionID.ToString() + "/release/"; | 835 | "/agent/" + agent.UUID.ToString() + "/" + m_scene.RegionInfo.RegionID.ToString() + "/release/"; |
847 | 836 | ||
848 | if (!m_scene.SimulationService.UpdateAgent(neighbourRegion, cAgent)) | 837 | if (!m_scene.SimulationService.UpdateAgent(neighbourRegion, cAgent)) |
@@ -870,8 +859,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
870 | } | 859 | } |
871 | // TODO Should construct this behind a method | 860 | // TODO Should construct this behind a method |
872 | string capsPath = | 861 | string capsPath = |
873 | "http://" + neighbourRegion.ExternalHostName + ":" + neighbourRegion.HttpPort | 862 | neighbourRegion.ServerURI + "/CAPS/" + agentcaps /*circuitdata.CapsPath*/ + "0000/"; |
874 | + "/CAPS/" + agentcaps /*circuitdata.CapsPath*/ + "0000/"; | ||
875 | 863 | ||
876 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, agent.UUID); | 864 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, agent.UUID); |
877 | 865 | ||
@@ -1190,8 +1178,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1190 | y = y / Constants.RegionSize; | 1178 | y = y / Constants.RegionSize; |
1191 | m_log.Info("[ENTITY TRANSFER MODULE]: Starting to inform client about neighbour " + x + ", " + y + "(" + endPoint.ToString() + ")"); | 1179 | m_log.Info("[ENTITY TRANSFER MODULE]: Starting to inform client about neighbour " + x + ", " + y + "(" + endPoint.ToString() + ")"); |
1192 | 1180 | ||
1193 | string capsPath = "http://" + reg.ExternalHostName + ":" + reg.HttpPort | 1181 | string capsPath = reg.ServerURI + "/CAPS/" + a.CapsPath + "0000/"; |
1194 | + "/CAPS/" + a.CapsPath + "0000/"; | ||
1195 | 1182 | ||
1196 | string reason = String.Empty; | 1183 | string reason = String.Empty; |
1197 | 1184 | ||