aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common
diff options
context:
space:
mode:
authorRobert Adams2014-01-03 07:41:06 -0800
committerRobert Adams2014-01-04 19:01:04 -0800
commit7e32313a491defe8f5fb62ce0036c1692d4b4af9 (patch)
treeba689f4a69419f6d23ecb26846f2b43b982669d8 /OpenSim/Tests/Common
parentvarregion: send region size in LLLoginResponse. (diff)
downloadopensim-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/Tests/Common')
-rw-r--r--OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs11
1 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs b/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs
index e666433..f2bae58 100644
--- a/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs
+++ b/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs
@@ -114,22 +114,25 @@ namespace OpenSim.Tests.Common
114 AddEvent(avatarID, "DisableSimulator", handle); 114 AddEvent(avatarID, "DisableSimulator", handle);
115 } 115 }
116 116
117 public void EnableSimulator (ulong handle, IPEndPoint endPoint, UUID avatarID) 117 public void EnableSimulator (ulong handle, IPEndPoint endPoint, UUID avatarID, int regionSizeX, int regionSizeY)
118 { 118 {
119 AddEvent(avatarID, "EnableSimulator", handle); 119 AddEvent(avatarID, "EnableSimulator", handle);
120 } 120 }
121 121
122 public void EstablishAgentCommunication (UUID avatarID, IPEndPoint endPoint, string capsPath) 122 public void EstablishAgentCommunication (UUID avatarID, IPEndPoint endPoint, string capsPath,
123 ulong regionHandle, int regionSizeX, int regionSizeY)
123 { 124 {
124 AddEvent(avatarID, "EstablishAgentCommunication", endPoint, capsPath); 125 AddEvent(avatarID, "EstablishAgentCommunication", endPoint, capsPath);
125 } 126 }
126 127
127 public void TeleportFinishEvent (ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags, string capsURL, UUID agentID) 128 public void TeleportFinishEvent (ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint,
129 uint locationID, uint flags, string capsURL, UUID agentID, int regionSizeX, int regionSizeY)
128 { 130 {
129 AddEvent(agentID, "TeleportFinishEvent", regionHandle, simAccess, regionExternalEndPoint, locationID, flags, capsURL); 131 AddEvent(agentID, "TeleportFinishEvent", regionHandle, simAccess, regionExternalEndPoint, locationID, flags, capsURL);
130 } 132 }
131 133
132 public void CrossRegion (ulong handle, Vector3 pos, Vector3 lookAt, IPEndPoint newRegionExternalEndPoint, string capsURL, UUID avatarID, UUID sessionID) 134 public void CrossRegion (ulong handle, Vector3 pos, Vector3 lookAt, IPEndPoint newRegionExternalEndPoint,
135 string capsURL, UUID avatarID, UUID sessionID, int regionSizeX, int regionSizeY)
133 { 136 {
134 AddEvent(avatarID, "CrossRegion", handle, pos, lookAt, newRegionExternalEndPoint, capsURL, sessionID); 137 AddEvent(avatarID, "CrossRegion", handle, pos, lookAt, newRegionExternalEndPoint, capsURL, sessionID);
135 } 138 }