aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Application/OpenSim.cs17
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
2 files changed, 17 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 3a1a8c7..867e36d 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -250,6 +250,8 @@ namespace OpenSim
250 + "If level <= 0 then no extra http logging is done.\n", 250 + "If level <= 0 then no extra http logging is done.\n",
251 Debug); 251 Debug);
252 252
253 m_console.Commands.AddCommand("region", false, "debug teleport", "debug teleport", "Toggle teleport route debugging", Debug);
254
253 m_console.Commands.AddCommand("region", false, "debug scene", 255 m_console.Commands.AddCommand("region", false, "debug scene",
254 "debug scene <cripting> <collisions> <physics>", 256 "debug scene <cripting> <collisions> <physics>",
255 "Turn on scene debugging", Debug); 257 "Turn on scene debugging", Debug);
@@ -948,6 +950,21 @@ namespace OpenSim
948 950
949 break; 951 break;
950 952
953 case "teleport":
954 foreach(Scene s in m_sceneManager.Scenes)
955 {
956 if (s.DEBUG)
957 {
958 s.DEBUG = false;
959 MainConsole.Instance.Output("Teleport debugging is disabled!");
960 }
961 else{
962 s.DEBUG = true;
963 MainConsole.Instance.Output("Teleport debugging is enabled!");
964 }
965 }
966 break;
967
951 default: 968 default:
952 MainConsole.Instance.Output("Unknown debug command"); 969 MainConsole.Instance.Output("Unknown debug command");
953 break; 970 break;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index ed6f68a..f03c345 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -651,8 +651,6 @@ namespace OpenSim.Region.Framework.Scenes
651 // 651 //
652 IConfig startupConfig = m_config.Configs["Startup"]; 652 IConfig startupConfig = m_config.Configs["Startup"];
653 653
654 DEBUG = startupConfig.GetBoolean("DEBUG", false);
655
656 m_defaultDrawDistance = startupConfig.GetFloat("DefaultDrawDistance",m_defaultDrawDistance); 654 m_defaultDrawDistance = startupConfig.GetFloat("DefaultDrawDistance",m_defaultDrawDistance);
657 m_useBackup = startupConfig.GetBoolean("UseSceneBackup", m_useBackup); 655 m_useBackup = startupConfig.GetBoolean("UseSceneBackup", m_useBackup);
658 if (!m_useBackup) 656 if (!m_useBackup)