aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorBlueWall2012-01-09 18:19:55 -0500
committerBlueWall2012-01-09 18:19:55 -0500
commit707c8c6f2b7671c0a439a28921daeac8e7219639 (patch)
tree123f16ef388d49734b9ac9b6f709a3b1a68ffd03
parentUse our TeleportFlags (diff)
downloadopensim-SC_OLD-707c8c6f2b7671c0a439a28921daeac8e7219639.zip
opensim-SC_OLD-707c8c6f2b7671c0a439a28921daeac8e7219639.tar.gz
opensim-SC_OLD-707c8c6f2b7671c0a439a28921daeac8e7219639.tar.bz2
opensim-SC_OLD-707c8c6f2b7671c0a439a28921daeac8e7219639.tar.xz
Add some run-time debugging support
Add configuration option - DEBUG to enable debugging methods. This is temporary for helping users testing teleport routing be able to report back the data with the test cases. We can remove when finished with this, or leave it if it proves to be useful. Users: set DEBUG = true in OpenSim.ini to get more information from teleport routing. The default is false. It presently prints the TeleportFlags value.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs4
-rwxr-xr-xbin/OpenSim.ini.example6
3 files changed, 12 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.
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index d4e61a5..01c64c5 100755
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -36,6 +36,12 @@
36 36
37 37
38[Startup] 38[Startup]
39
40 ;# {DEBUG} {} {Turn on debugging methods. Temporary for debugging teleport routing. We can remove it when that is done, or leave it if it would prove to be useful for other things.} {true false} false
41 ;; Turn on debugging methods where available.
42 ;; from the selected region_info_source.
43 ; DEBUG = false
44
39 ;# {ConsolePrompt} {} {ConsolePrompt} {} "Region (\R) " 45 ;# {ConsolePrompt} {} {ConsolePrompt} {} "Region (\R) "
40 ;; Console prompt 46 ;; Console prompt
41 ;; Certain special characters can be used to customize the prompt 47 ;; Certain special characters can be used to customize the prompt