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

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
             AddEvent(avatarID, "DisableSimulator", handle);
         }
 
-        public void EnableSimulator (ulong handle, IPEndPoint endPoint, UUID avatarID)
+        public void EnableSimulator (ulong handle, IPEndPoint endPoint, UUID avatarID, int regionSizeX, int regionSizeY)
         {
             AddEvent(avatarID, "EnableSimulator", handle);
         }
 
-        public void EstablishAgentCommunication (UUID avatarID, IPEndPoint endPoint, string capsPath)
+        public void EstablishAgentCommunication (UUID avatarID, IPEndPoint endPoint, string capsPath,
+                                ulong regionHandle, int regionSizeX, int regionSizeY)
         {
             AddEvent(avatarID, "EstablishAgentCommunication", endPoint, capsPath);
         }
 
-        public void TeleportFinishEvent (ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags, string capsURL, UUID agentID)
+        public void TeleportFinishEvent (ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint,
+                    uint locationID, uint flags, string capsURL, UUID agentID, int regionSizeX, int regionSizeY)
         {
             AddEvent(agentID, "TeleportFinishEvent", regionHandle, simAccess, regionExternalEndPoint, locationID, flags, capsURL);
         }
 
-        public void CrossRegion (ulong handle, Vector3 pos, Vector3 lookAt, IPEndPoint newRegionExternalEndPoint, string capsURL, UUID avatarID, UUID sessionID)
+        public void CrossRegion (ulong handle, Vector3 pos, Vector3 lookAt, IPEndPoint newRegionExternalEndPoint,
+                                    string capsURL, UUID avatarID, UUID sessionID, int regionSizeX, int regionSizeY)
         {
             AddEvent(avatarID, "CrossRegion", handle, pos, lookAt, newRegionExternalEndPoint, capsURL, sessionID);
         }