aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs29
1 files changed, 21 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index 0447bc4..b162bb9 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -59,6 +59,7 @@ namespace OpenSim.Region.ClientStack.Linden
59 public class EventQueueGetModule : IEventQueue, INonSharedRegionModule 59 public class EventQueueGetModule : IEventQueue, INonSharedRegionModule
60 { 60 {
61 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 61 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
62 private static string LogHeader = "[EVENT QUEUE GET MODULE]";
62 63
63 /// <value> 64 /// <value>
64 /// Debug level. 65 /// Debug level.
@@ -717,34 +718,46 @@ namespace OpenSim.Region.ClientStack.Linden
717 Enqueue(item, avatarID); 718 Enqueue(item, avatarID);
718 } 719 }
719 720
720 public virtual void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID) 721 public virtual void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID, int regionSizeX, int regionSizeY)
721 { 722 {
722 OSD item = EventQueueHelper.EnableSimulator(handle, endPoint); 723 m_log.DebugFormat("{0} EnableSimulator. handle={1}, avatarID={2}, regionSize={3},{4}>",
724 LogHeader, handle, avatarID, regionSizeX, regionSizeY);
725
726 OSD item = EventQueueHelper.EnableSimulator(handle, endPoint, regionSizeX, regionSizeY);
723 Enqueue(item, avatarID); 727 Enqueue(item, avatarID);
724 } 728 }
725 729
726 public virtual void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, string capsPath) 730 public virtual void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, string capsPath,
731 ulong regionHandle, int regionSizeX, int regionSizeY)
727 { 732 {
728 OSD item = EventQueueHelper.EstablishAgentCommunication(avatarID, endPoint.ToString(), capsPath); 733 m_log.DebugFormat("{0} EstablishAgentCommunication. handle={1}, avatarID={2}, regionSize={3},{4}>",
734 LogHeader, regionHandle, avatarID, regionSizeX, regionSizeY);
735 OSD item = EventQueueHelper.EstablishAgentCommunication(avatarID, endPoint.ToString(), capsPath, regionHandle, regionSizeX, regionSizeY);
729 Enqueue(item, avatarID); 736 Enqueue(item, avatarID);
730 } 737 }
731 738
732 public virtual void TeleportFinishEvent(ulong regionHandle, byte simAccess, 739 public virtual void TeleportFinishEvent(ulong regionHandle, byte simAccess,
733 IPEndPoint regionExternalEndPoint, 740 IPEndPoint regionExternalEndPoint,
734 uint locationID, uint flags, string capsURL, 741 uint locationID, uint flags, string capsURL,
735 UUID avatarID) 742 UUID avatarID, int regionSizeX, int regionSizeY)
736 { 743 {
744 m_log.DebugFormat("{0} TeleportFinishEvent. handle={1}, avatarID={2}, regionSize=<{3},{4}>",
745 LogHeader, regionHandle, avatarID, regionSizeX, regionSizeY);
746
737 OSD item = EventQueueHelper.TeleportFinishEvent(regionHandle, simAccess, regionExternalEndPoint, 747 OSD item = EventQueueHelper.TeleportFinishEvent(regionHandle, simAccess, regionExternalEndPoint,
738 locationID, flags, capsURL, avatarID); 748 locationID, flags, capsURL, avatarID, regionSizeX, regionSizeY);
739 Enqueue(item, avatarID); 749 Enqueue(item, avatarID);
740 } 750 }
741 751
742 public virtual void CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt, 752 public virtual void CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt,
743 IPEndPoint newRegionExternalEndPoint, 753 IPEndPoint newRegionExternalEndPoint,
744 string capsURL, UUID avatarID, UUID sessionID) 754 string capsURL, UUID avatarID, UUID sessionID, int regionSizeX, int regionSizeY)
745 { 755 {
756 m_log.DebugFormat("{0} CrossRegion. handle={1}, avatarID={2}, regionSize={3},{4}>",
757 LogHeader, handle, avatarID, regionSizeX, regionSizeY);
758
746 OSD item = EventQueueHelper.CrossRegion(handle, pos, lookAt, newRegionExternalEndPoint, 759 OSD item = EventQueueHelper.CrossRegion(handle, pos, lookAt, newRegionExternalEndPoint,
747 capsURL, avatarID, sessionID); 760 capsURL, avatarID, sessionID, regionSizeX, regionSizeY);
748 Enqueue(item, avatarID); 761 Enqueue(item, avatarID);
749 } 762 }
750 763