diff options
author | Justin Clarke Casey | 2009-01-19 17:15:27 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-01-19 17:15:27 +0000 |
commit | 96e15058d5928c3d11a37e5e3ecdb2e2fb0d805f (patch) | |
tree | 2c1ff47911f5f77217b082f8c4788d76b67395bc /OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | |
parent | * Progressive texture patch + PriorityQueue put into the LLClient namespace. (diff) | |
download | opensim-SC-96e15058d5928c3d11a37e5e3ecdb2e2fb0d805f.zip opensim-SC-96e15058d5928c3d11a37e5e3ecdb2e2fb0d805f.tar.gz opensim-SC-96e15058d5928c3d11a37e5e3ecdb2e2fb0d805f.tar.bz2 opensim-SC-96e15058d5928c3d11a37e5e3ecdb2e2fb0d805f.tar.xz |
* minor: Just some minor log elaboration to reveal in the logs where a teleport is being directed rather than just its position
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs index 4f3863c..74f5dc7 100644 --- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | |||
@@ -680,8 +680,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
680 | public virtual void RequestTeleportToLocation(ScenePresence avatar, ulong regionHandle, Vector3 position, | 680 | public virtual void RequestTeleportToLocation(ScenePresence avatar, ulong regionHandle, Vector3 position, |
681 | Vector3 lookAt, uint teleportFlags) | 681 | Vector3 lookAt, uint teleportFlags) |
682 | { | 682 | { |
683 | m_log.DebugFormat("[SCENE COMMUNICATION SERVICE]: RequestTeleportToLocation {0} ", position.ToString()); | ||
684 | |||
685 | if (!avatar.Scene.Permissions.CanTeleport(avatar.UUID)) | 683 | if (!avatar.Scene.Permissions.CanTeleport(avatar.UUID)) |
686 | return; | 684 | return; |
687 | 685 | ||
@@ -691,6 +689,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
691 | 689 | ||
692 | if (regionHandle == m_regionInfo.RegionHandle) | 690 | if (regionHandle == m_regionInfo.RegionHandle) |
693 | { | 691 | { |
692 | m_log.DebugFormat( | ||
693 | "[SCENE COMMUNICATION SERVICE]: RequestTeleportToLocation {0} within {1}", | ||
694 | position, m_regionInfo.RegionName); | ||
695 | |||
694 | // Teleport within the same region | 696 | // Teleport within the same region |
695 | if (position.X < 0 || position.X > Constants.RegionSize || position.Y < 0 || position.Y > Constants.RegionSize || position.Z < 0) | 697 | if (position.X < 0 || position.X > Constants.RegionSize || position.Y < 0 || position.Y > Constants.RegionSize || position.Z < 0) |
696 | { | 698 | { |
@@ -723,6 +725,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
723 | RegionInfo reg = RequestNeighbouringRegionInfo(regionHandle); | 725 | RegionInfo reg = RequestNeighbouringRegionInfo(regionHandle); |
724 | if (reg != null) | 726 | if (reg != null) |
725 | { | 727 | { |
728 | m_log.DebugFormat( | ||
729 | "[SCENE COMMUNICATION SERVICE]: RequestTeleportToLocation to {0} {1}", | ||
730 | position, reg.RegionName); | ||
731 | |||
726 | if (eq == null) | 732 | if (eq == null) |
727 | avatar.ControllingClient.SendTeleportLocationStart(); | 733 | avatar.ControllingClient.SendTeleportLocationStart(); |
728 | 734 | ||
@@ -870,6 +876,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
870 | avatar.ControllingClient.SendTeleportFailed("Problems connecting to destination."); | 876 | avatar.ControllingClient.SendTeleportFailed("Problems connecting to destination."); |
871 | 877 | ||
872 | ResetFromTransit(avatar.UUID); | 878 | ResetFromTransit(avatar.UUID); |
879 | |||
873 | // Yikes! We should just have a ref to scene here. | 880 | // Yikes! We should just have a ref to scene here. |
874 | avatar.Scene.InformClientOfNeighbours(avatar); | 881 | avatar.Scene.InformClientOfNeighbours(avatar); |
875 | 882 | ||