From e5f7c8b6e83170cbc7e0d49d9efd3fc3600396d3 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 24 Dec 2013 12:31:26 -0800
Subject: varregion: add lots of DEBUG level log messages. Especially for
 teleport.

---
 OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs | 3 +--
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs           | 4 ++--
 OpenSim/Region/Framework/Scenes/SceneBase.cs                 | 3 ++-
 OpenSim/Region/Framework/Scenes/ScenePresence.cs             | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index 3fa3706..966916a 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -76,8 +76,7 @@ namespace OpenSim.Region.Framework.Interfaces
 
         void Cross(SceneObjectGroup sog, Vector3 position, bool silent);
 
-        ScenePresence CrossAgentToNewRegionAsync(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, string version);
-
+        ScenePresence CrossAgentToNewRegionAsync(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, string version);
     }
 
     public interface IUserAgentVerificationModule
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 65536db..9ae8612 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -46,8 +46,8 @@ namespace OpenSim.Region.Framework.Scenes
 {
     public partial class Scene
     {
-        private static readonly ILog m_log
-            = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly string LogHeader = "[SCENE INVENTORY]";
 
         /// <summary>
         /// Allows asynchronous derezzing of objects from the scene into a client's inventory.
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 4f04706..f95220d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -42,7 +42,8 @@ namespace OpenSim.Region.Framework.Scenes
 {
     public abstract class SceneBase : IScene
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly string LogHeader = "[SCENE]";
 
         #region Events
 
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 0cd8b21..4efd9d5 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -76,6 +76,7 @@ namespace OpenSim.Region.Framework.Scenes
     public class ScenePresence : EntityBase, IScenePresence
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly String LogHeader = "[SCENE PRESENCE]";
 
 //        ~ScenePresence()
 //        {
@@ -3438,12 +3439,11 @@ namespace OpenSim.Region.Framework.Scenes
 
                 if (!IsInTransit)
                 {
-                    m_log.DebugFormat(
-                        "[SCENE PRESENCE]: Testing border check for projected position {0} of {1} in {2}", 
-                        pos2, Name, Scene.Name);
-
                     if (!m_scene.PositionIsInCurrentRegion(pos2))
                     {
+                        m_log.DebugFormat("{0} CheckForBorderCrossing: position outside region. {1} in {2} at pos {3}", 
+                                                LogHeader, Name, Scene.Name, pos2);
+
                         // Disconnect from the current region
                         bool isFlying = Flying;
                         RemoveFromPhysicalScene();
-- 
cgit v1.1