diff options
author | onefang | 2019-09-11 16:36:50 +1000 |
---|---|---|
committer | onefang | 2019-09-11 16:36:50 +1000 |
commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs | |
parent | Renamed branch to SledjChisl. (diff) | |
parent | Bump to release flavour, build 0. (diff) | |
download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz |
Merge branch 'SledjChisl'
Diffstat (limited to 'OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs')
-rw-r--r-- | OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs b/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs index b215f1e..b0c9596 100644 --- a/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs | |||
@@ -56,7 +56,7 @@ namespace OpenSim.Tests.Common | |||
56 | /// </summary> | 56 | /// </summary> |
57 | /// <param name='tc'></param> | 57 | /// <param name='tc'></param> |
58 | /// <param name='neighbourTcs'> | 58 | /// <param name='neighbourTcs'> |
59 | /// A list that will be populated with any TestClients set up in response to | 59 | /// A list that will be populated with any TestClients set up in response to |
60 | /// being informed about a destination region. | 60 | /// being informed about a destination region. |
61 | /// </param> | 61 | /// </param> |
62 | public static void SetupInformClientOfNeighbourTriggersNeighbourClientCreate( | 62 | public static void SetupInformClientOfNeighbourTriggersNeighbourClientCreate( |
@@ -71,7 +71,7 @@ namespace OpenSim.Tests.Common | |||
71 | Util.RegionHandleToRegionLoc(neighbourHandle, out x, out y); | 71 | Util.RegionHandleToRegionLoc(neighbourHandle, out x, out y); |
72 | 72 | ||
73 | m_log.DebugFormat( | 73 | m_log.DebugFormat( |
74 | "[TEST CLIENT]: Processing inform client of neighbour located at {0},{1} at {2}", | 74 | "[TEST CLIENT]: Processing inform client of neighbour located at {0},{1} at {2}", |
75 | x, y, neighbourExternalEndPoint); | 75 | x, y, neighbourExternalEndPoint); |
76 | 76 | ||
77 | AgentCircuitData newAgent = tc.RequestClientInfo(); | 77 | AgentCircuitData newAgent = tc.RequestClientInfo(); |
@@ -91,20 +91,20 @@ namespace OpenSim.Tests.Common | |||
91 | /// </summary> | 91 | /// </summary> |
92 | /// <param name='tc'></param> | 92 | /// <param name='tc'></param> |
93 | /// <param name='neighbourTcs'> | 93 | /// <param name='neighbourTcs'> |
94 | /// A list that will be populated with any TestClients set up in response to | 94 | /// A list that will be populated with any TestClients set up in response to |
95 | /// being informed about a destination region. | 95 | /// being informed about a destination region. |
96 | /// </param> | 96 | /// </param> |
97 | public static void SetupSendRegionTeleportTriggersDestinationClientCreateAndCompleteMovement( | 97 | public static void SetupSendRegionTeleportTriggersDestinationClientCreateAndCompleteMovement( |
98 | TestClient client, List<TestClient> destinationClients) | 98 | TestClient client, List<TestClient> destinationClients) |
99 | { | 99 | { |
100 | client.OnTestClientSendRegionTeleport | 100 | client.OnTestClientSendRegionTeleport |
101 | += (regionHandle, simAccess, regionExternalEndPoint, locationID, flags, capsURL) => | 101 | += (regionHandle, simAccess, regionExternalEndPoint, locationID, flags, capsURL) => |
102 | { | 102 | { |
103 | uint x, y; | 103 | uint x, y; |
104 | Util.RegionHandleToRegionLoc(regionHandle, out x, out y); | 104 | Util.RegionHandleToRegionLoc(regionHandle, out x, out y); |
105 | 105 | ||
106 | m_log.DebugFormat( | 106 | m_log.DebugFormat( |
107 | "[TEST CLIENT]: Processing send region teleport for destination at {0},{1} at {2}", | 107 | "[TEST CLIENT]: Processing send region teleport for destination at {0},{1} at {2}", |
108 | x, y, regionExternalEndPoint); | 108 | x, y, regionExternalEndPoint); |
109 | 109 | ||
110 | AgentCircuitData newAgent = client.RequestClientInfo(); | 110 | AgentCircuitData newAgent = client.RequestClientInfo(); |
@@ -120,4 +120,4 @@ namespace OpenSim.Tests.Common | |||
120 | }; | 120 | }; |
121 | } | 121 | } |
122 | } | 122 | } |
123 | } \ No newline at end of file | 123 | } |