2 files changed, 5 insertions, 2 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index f2200da..e1e4ed5 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Region.Framework.Scenes
         #region Fields
 
         public bool EmergencyMonitoring = false;
-        public bool DEBUG = false;
+        public bool DebugTeleporting { get; private set; }
 
         public SynchronizeSceneHandler SynchronizeScene;
         public SimStatsReporter StatsReporter;
@@ -1064,6 +1064,9 @@ namespace OpenSim.Region.Framework.Scenes
                 if (bool.TryParse(options["physics"], out enablePhysics) && m_physics_enabled != enablePhysics)
                     m_physics_enabled = enablePhysics;
             }
+
+            if (options.ContainsKey("teleport"))
+                DebugTeleporting = true;
         }
 
         public int GetInaccurateNeighborCount()
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 704d12d..cf60c69 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3826,7 +3826,7 @@ namespace OpenSim.Region.Framework.Scenes
             ILandObject land = m_scene.LandChannel.GetLandObject(pos.X, pos.Y);
             if (land != null)
             {
-                if (Scene.DEBUG)
+                if (Scene.DebugTeleporting)
                     TeleportFlagsDebug();
 
                 // If we come in via login, landmark or map, we want to