aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs4
2 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 5e1c768..ed6f68a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -65,6 +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 69
69 public SynchronizeSceneHandler SynchronizeScene; 70 public SynchronizeSceneHandler SynchronizeScene;
70 public SimStatsReporter StatsReporter; 71 public SimStatsReporter StatsReporter;
@@ -650,6 +651,8 @@ namespace OpenSim.Region.Framework.Scenes
650 // 651 //
651 IConfig startupConfig = m_config.Configs["Startup"]; 652 IConfig startupConfig = m_config.Configs["Startup"];
652 653
654 DEBUG = startupConfig.GetBoolean("DEBUG", false);
655
653 m_defaultDrawDistance = startupConfig.GetFloat("DefaultDrawDistance",m_defaultDrawDistance); 656 m_defaultDrawDistance = startupConfig.GetFloat("DefaultDrawDistance",m_defaultDrawDistance);
654 m_useBackup = startupConfig.GetBoolean("UseSceneBackup", m_useBackup); 657 m_useBackup = startupConfig.GetBoolean("UseSceneBackup", m_useBackup);
655 if (!m_useBackup) 658 if (!m_useBackup)
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index d58484e..1869417 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3841,7 +3841,9 @@ namespace OpenSim.Region.Framework.Scenes
3841 ILandObject land = m_scene.LandChannel.GetLandObject(pos.X, pos.Y); 3841 ILandObject land = m_scene.LandChannel.GetLandObject(pos.X, pos.Y);
3842 if (land != null) 3842 if (land != null)
3843 { 3843 {
3844 TeleportFlagsDebug(); 3844 if (Scene.DEBUG)
3845 TeleportFlagsDebug();
3846
3845 // If we come in via login, landmark or map, we want to 3847 // If we come in via login, landmark or map, we want to
3846 // honor landing points. If we come in via Lure, we want 3848 // honor landing points. If we come in via Lure, we want
3847 // to ignore them. 3849 // to ignore them.