aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs5
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
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
65 #region Fields 65 #region Fields
66 66
67 public bool EmergencyMonitoring = false; 67 public bool EmergencyMonitoring = false;
68 public bool DEBUG = false; 68 public bool DebugTeleporting { get; private set; }
69 69
70 public SynchronizeSceneHandler SynchronizeScene; 70 public SynchronizeSceneHandler SynchronizeScene;
71 public SimStatsReporter StatsReporter; 71 public SimStatsReporter StatsReporter;
@@ -1064,6 +1064,9 @@ namespace OpenSim.Region.Framework.Scenes
1064 if (bool.TryParse(options["physics"], out enablePhysics) && m_physics_enabled != enablePhysics) 1064 if (bool.TryParse(options["physics"], out enablePhysics) && m_physics_enabled != enablePhysics)
1065 m_physics_enabled = enablePhysics; 1065 m_physics_enabled = enablePhysics;
1066 } 1066 }
1067
1068 if (options.ContainsKey("teleport"))
1069 DebugTeleporting = true;
1067 } 1070 }
1068 1071
1069 public int GetInaccurateNeighborCount() 1072 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
3826 ILandObject land = m_scene.LandChannel.GetLandObject(pos.X, pos.Y); 3826 ILandObject land = m_scene.LandChannel.GetLandObject(pos.X, pos.Y);
3827 if (land != null) 3827 if (land != null)
3828 { 3828 {
3829 if (Scene.DEBUG) 3829 if (Scene.DebugTeleporting)
3830 TeleportFlagsDebug(); 3830 TeleportFlagsDebug();
3831 3831
3832 // If we come in via login, landmark or map, we want to 3832 // If we come in via login, landmark or map, we want to