From 96e15058d5928c3d11a37e5e3ecdb2e2fb0d805f Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Mon, 19 Jan 2009 17:15:27 +0000
Subject: * minor: Just some minor log elaboration to reveal in the logs where
 a teleport is being directed rather than just its position

---
 .../Modules/Communications/REST/RESTInterregionComms.cs     | 13 +++++++------
 .../Region/Environment/Scenes/SceneCommunicationService.cs  | 11 +++++++++--
 2 files changed, 16 insertions(+), 8 deletions(-)

(limited to 'OpenSim/Region/Environment')

diff --git a/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs b/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
index 82ed5d4..b4302fd 100644
--- a/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
+++ b/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
@@ -184,6 +184,7 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
             return false;
 
         }
+        
         public bool SendReleaseAgent(ulong regionHandle, UUID id, string uri)
         {
             // Try local first
@@ -209,11 +210,12 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
             //else
             //    m_log.Warn("[REST COMMS]: Region not found " + regionHandle);
             return false;
-        }
+        }              
 
         #endregion /* IInterregionComms */
 
         #region DoWork functions for the above public interface
+        
         //-------------------------------------------------------------------
         // Internal  functions for the above public interface
         //-------------------------------------------------------------------
@@ -385,7 +387,6 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
             }
 
             return true;
-
         }
 
         protected bool DoReleaseAgentCall(ulong regionHandle, UUID id, string uri)
@@ -418,7 +419,6 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
             }
 
             return true;
-
         }
 
         protected bool DoCloseAgentCall(RegionInfo region, UUID id)
@@ -453,10 +453,9 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
             }
 
             return true;
-
         }
-
-        #endregion /* DoWork */
+        
+        #endregion /* Do Work */
 
         #region Incoming calls from remote instances
 
@@ -653,9 +652,11 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
             responsedata["int_response_code"] = 200;
             responsedata["str_response_string"] = "OpenSim agent " + id.ToString();
         }
+        
         #endregion 
 
         #region Misc
+        
         /// <summary>
         /// Extract the param from an uri.
         /// </summary>
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
         public virtual void RequestTeleportToLocation(ScenePresence avatar, ulong regionHandle, Vector3 position,
                                                       Vector3 lookAt, uint teleportFlags)
         {
-            m_log.DebugFormat("[SCENE COMMUNICATION SERVICE]: RequestTeleportToLocation {0} ", position.ToString());
-
             if (!avatar.Scene.Permissions.CanTeleport(avatar.UUID))
                 return;
 
@@ -691,6 +689,10 @@ namespace OpenSim.Region.Environment.Scenes
 
             if (regionHandle == m_regionInfo.RegionHandle)
             {
+                m_log.DebugFormat(
+                    "[SCENE COMMUNICATION SERVICE]: RequestTeleportToLocation {0} within {1}", 
+                    position, m_regionInfo.RegionName);
+                
                 // Teleport within the same region
                 if (position.X < 0 || position.X > Constants.RegionSize || position.Y < 0 || position.Y > Constants.RegionSize || position.Z < 0)
                 {
@@ -723,6 +725,10 @@ namespace OpenSim.Region.Environment.Scenes
                 RegionInfo reg = RequestNeighbouringRegionInfo(regionHandle);
                 if (reg != null)
                 {
+                    m_log.DebugFormat(
+                        "[SCENE COMMUNICATION SERVICE]: RequestTeleportToLocation to {0} {1}", 
+                        position, reg.RegionName);
+                    
                     if (eq == null)
                         avatar.ControllingClient.SendTeleportLocationStart();
 
@@ -870,6 +876,7 @@ namespace OpenSim.Region.Environment.Scenes
                             avatar.ControllingClient.SendTeleportFailed("Problems connecting to destination.");
 
                             ResetFromTransit(avatar.UUID);
+                            
                             // Yikes! We should just have a ref to scene here.
                             avatar.Scene.InformClientOfNeighbours(avatar);
 
-- 
cgit v1.1