aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-03-21 01:13:44 +0000
committerJustin Clark-Casey (justincc)2012-03-21 01:13:44 +0000
commitab243f4a5794e6b7b9a414c2e1bb57d3d0abfb75 (patch)
tree55129150822b98fa4dfac783eed9f0b2b75e2587 /OpenSim
parentReplace "scene debug true false true" console command with "scene debug scrip... (diff)
downloadopensim-SC_OLD-ab243f4a5794e6b7b9a414c2e1bb57d3d0abfb75.zip
opensim-SC_OLD-ab243f4a5794e6b7b9a414c2e1bb57d3d0abfb75.tar.gz
opensim-SC_OLD-ab243f4a5794e6b7b9a414c2e1bb57d3d0abfb75.tar.bz2
opensim-SC_OLD-ab243f4a5794e6b7b9a414c2e1bb57d3d0abfb75.tar.xz
Incorporate scene teleporting debugging into "debug scene teleport true|false" command
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs17
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs5
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
3 files changed, 6 insertions, 18 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 169efbd..59b6b21 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -937,26 +937,11 @@ namespace OpenSim
937 } 937 }
938 else 938 else
939 { 939 {
940 MainConsole.Instance.Output("Usage: debug scene scripting|collisions|physics true|false"); 940 MainConsole.Instance.Output("Usage: debug scene scripting|collisions|physics|teleport true|false");
941 } 941 }
942 942
943 break; 943 break;
944 944
945 case "teleport":
946 foreach(Scene s in m_sceneManager.Scenes)
947 {
948 if (s.DEBUG)
949 {
950 s.DEBUG = false;
951 MainConsole.Instance.Output("Teleport debugging is disabled!");
952 }
953 else{
954 s.DEBUG = true;
955 MainConsole.Instance.Output("Teleport debugging is enabled!");
956 }
957 }
958 break;
959
960 default: 945 default:
961 MainConsole.Instance.Output("Unknown debug command"); 946 MainConsole.Instance.Output("Unknown debug command");
962 break; 947 break;
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