diff options
author | Robert Adams | 2014-01-03 07:41:06 -0800 |
---|---|---|
committer | Robert Adams | 2014-01-04 19:01:04 -0800 |
commit | 7e32313a491defe8f5fb62ce0036c1692d4b4af9 (patch) | |
tree | ba689f4a69419f6d23ecb26846f2b43b982669d8 /OpenSim/Region/CoreModules/Framework | |
parent | varregion: send region size in LLLoginResponse. (diff) | |
download | opensim-SC_OLD-7e32313a491defe8f5fb62ce0036c1692d4b4af9.zip opensim-SC_OLD-7e32313a491defe8f5fb62ce0036c1692d4b4af9.tar.gz opensim-SC_OLD-7e32313a491defe8f5fb62ce0036c1692d4b4af9.tar.bz2 opensim-SC_OLD-7e32313a491defe8f5fb62ce0036c1692d4b4af9.tar.xz |
varregion: Add region size to teleport event messages (EnableSimulator,
CorssRegion, TeleportFinishEvent).
Have Simian grid service return the region size.
Many teleport related debug log messages. Can be removed when teleport
works (like that's ever going to happen).
Conflicts:
OpenSim/Framework/RegionInfo.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index ef5239a..717c802 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -825,7 +825,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
825 | // The EnableSimulator message makes the client establish a connection with the destination | 825 | // The EnableSimulator message makes the client establish a connection with the destination |
826 | // simulator by sending the initial UseCircuitCode UDP packet to the destination containing the | 826 | // simulator by sending the initial UseCircuitCode UDP packet to the destination containing the |
827 | // correct circuit code. | 827 | // correct circuit code. |
828 | m_eqModule.EnableSimulator(destinationHandle, endPoint, sp.UUID); | 828 | m_eqModule.EnableSimulator(destinationHandle, endPoint, sp.UUID, |
829 | finalDestination.RegionSizeX, finalDestination.RegionSizeY); | ||
830 | m_log.DebugFormat("{0} Sent EnableSimulator. regName={1}, size=<{2},{3}>", LogHeader, | ||
831 | finalDestination.RegionName, finalDestination.RegionSizeX, finalDestination.RegionSizeY); | ||
829 | 832 | ||
830 | // XXX: Is this wait necessary? We will always end up waiting on UpdateAgent for the destination | 833 | // XXX: Is this wait necessary? We will always end up waiting on UpdateAgent for the destination |
831 | // simulator to confirm that it has established communication with the viewer. | 834 | // simulator to confirm that it has established communication with the viewer. |
@@ -835,7 +838,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
835 | // unnecessary - teleport will succeed and SEED caps will be requested without it (though possibly | 838 | // unnecessary - teleport will succeed and SEED caps will be requested without it (though possibly |
836 | // only on TeleportFinish). This is untested for region teleport between different simulators | 839 | // only on TeleportFinish). This is untested for region teleport between different simulators |
837 | // though this probably also works. | 840 | // though this probably also works. |
838 | m_eqModule.EstablishAgentCommunication(sp.UUID, endPoint, capsPath); | 841 | m_eqModule.EstablishAgentCommunication(sp.UUID, endPoint, capsPath, finalDestination.RegionHandle, |
842 | finalDestination.RegionSizeX, finalDestination.RegionSizeY); | ||
839 | } | 843 | } |
840 | else | 844 | else |
841 | { | 845 | { |
@@ -921,7 +925,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
921 | // OK, send TPFinish to the client, so that it starts the process of contacting the destination region | 925 | // OK, send TPFinish to the client, so that it starts the process of contacting the destination region |
922 | if (m_eqModule != null) | 926 | if (m_eqModule != null) |
923 | { | 927 | { |
924 | m_eqModule.TeleportFinishEvent(destinationHandle, 13, endPoint, 0, teleportFlags, capsPath, sp.UUID); | 928 | m_eqModule.TeleportFinishEvent(destinationHandle, 13, endPoint, 0, teleportFlags, capsPath, sp.UUID, |
929 | finalDestination.RegionSizeX, finalDestination.RegionSizeY); | ||
925 | } | 930 | } |
926 | else | 931 | else |
927 | { | 932 | { |
@@ -1074,7 +1079,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1074 | 1079 | ||
1075 | // New protocol: send TP Finish directly, without prior ES or EAC. That's what happens in the Linden grid | 1080 | // New protocol: send TP Finish directly, without prior ES or EAC. That's what happens in the Linden grid |
1076 | if (m_eqModule != null) | 1081 | if (m_eqModule != null) |
1077 | m_eqModule.TeleportFinishEvent(destinationHandle, 13, endPoint, 0, teleportFlags, capsPath, sp.UUID); | 1082 | m_eqModule.TeleportFinishEvent(destinationHandle, 13, endPoint, 0, teleportFlags, capsPath, sp.UUID, |
1083 | finalDestination.RegionSizeX, finalDestination.RegionSizeY); | ||
1078 | else | 1084 | else |
1079 | sp.ControllingClient.SendRegionTeleport(destinationHandle, 13, endPoint, 4, | 1085 | sp.ControllingClient.SendRegionTeleport(destinationHandle, 13, endPoint, 4, |
1080 | teleportFlags, capsPath); | 1086 | teleportFlags, capsPath); |
@@ -1717,11 +1723,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1717 | if (m_eqModule != null) | 1723 | if (m_eqModule != null) |
1718 | { | 1724 | { |
1719 | m_eqModule.CrossRegion( | 1725 | m_eqModule.CrossRegion( |
1720 | neighbourRegion.RegionHandle, pos + agent.Velocity, vel2 /* agent.Velocity */, neighbourRegion.ExternalEndPoint, | 1726 | neighbourRegion.RegionHandle, pos + agent.Velocity, vel2 /* agent.Velocity */, |
1721 | capsPath, agent.UUID, agent.ControllingClient.SessionId); | 1727 | neighbourRegion.ExternalEndPoint, |
1728 | capsPath, agent.UUID, agent.ControllingClient.SessionId, | ||
1729 | neighbourRegion.RegionSizeX, neighbourRegion.RegionSizeY); | ||
1722 | } | 1730 | } |
1723 | else | 1731 | else |
1724 | { | 1732 | { |
1733 | m_log.ErrorFormat("{0} Using old CrossRegion packet. Varregion will not work!!", LogHeader); | ||
1725 | agent.ControllingClient.CrossRegion(neighbourRegion.RegionHandle, pos + agent.Velocity, agent.Velocity, neighbourRegion.ExternalEndPoint, | 1734 | agent.ControllingClient.CrossRegion(neighbourRegion.RegionHandle, pos + agent.Velocity, agent.Velocity, neighbourRegion.ExternalEndPoint, |
1726 | capsPath); | 1735 | capsPath); |
1727 | } | 1736 | } |
@@ -2087,12 +2096,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
2087 | } | 2096 | } |
2088 | #endregion | 2097 | #endregion |
2089 | 2098 | ||
2090 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: {0} is sending {1} EnableSimulator for neighbour region {2} @ {3} " + | 2099 | m_log.DebugFormat("{0} {1} is sending {2} EnableSimulator for neighbour region {3}(loc=<{4},{5}>,siz=<{6},{7}>) " + |
2091 | "and EstablishAgentCommunication with seed cap {4}", | 2100 | "and EstablishAgentCommunication with seed cap {8}", LogHeader, |
2092 | scene.RegionInfo.RegionName, sp.Name, reg.RegionName, reg.RegionHandle, capsPath); | 2101 | scene.RegionInfo.RegionName, sp.Name, |
2102 | reg.RegionName, reg.RegionLocX, reg.RegionLocY, reg.RegionSizeX, reg.RegionSizeY , capsPath); | ||
2093 | 2103 | ||
2094 | m_eqModule.EnableSimulator(reg.RegionHandle, endPoint, sp.UUID); | 2104 | m_eqModule.EnableSimulator(reg.RegionHandle, endPoint, sp.UUID, reg.RegionSizeX, reg.RegionSizeY); |
2095 | m_eqModule.EstablishAgentCommunication(sp.UUID, endPoint, capsPath); | 2105 | m_eqModule.EstablishAgentCommunication(sp.UUID, endPoint, capsPath, reg.RegionHandle, reg.RegionSizeX, reg.RegionSizeY); |
2096 | } | 2106 | } |
2097 | else | 2107 | else |
2098 | { | 2108 | { |