aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-07-12 20:04:31 +0000
committerJustin Clarke Casey2008-07-12 20:04:31 +0000
commitb835b1d7ec0b301ff61918db132324ddbeb410d8 (patch)
treeff6b3d34612101533a65f26295aace7285008160
parent* Refactor: Minor cleanup of Debug method in OpenSim.cs (diff)
downloadopensim-SC_OLD-b835b1d7ec0b301ff61918db132324ddbeb410d8.zip
opensim-SC_OLD-b835b1d7ec0b301ff61918db132324ddbeb410d8.tar.gz
opensim-SC_OLD-b835b1d7ec0b301ff61918db132324ddbeb410d8.tar.bz2
opensim-SC_OLD-b835b1d7ec0b301ff61918db132324ddbeb410d8.tar.xz
* refactor: collapse scene debug settings into same format as packet debug settings
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs50
1 files changed, 30 insertions, 20 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 5745048..e5cc795 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -244,24 +244,6 @@ namespace OpenSim
244 Debug(cmdparams); 244 Debug(cmdparams);
245 break; 245 break;
246 246
247 case "scene-debug":
248 if (cmdparams.Length == 3)
249 {
250 if (m_sceneManager.CurrentScene == null)
251 {
252 m_console.Error("CONSOLE", "Please use 'change-region <regioname>' first");
253 }
254 else
255 {
256 m_sceneManager.CurrentScene.SetSceneCoreDebug(!Convert.ToBoolean(cmdparams[0]), !Convert.ToBoolean(cmdparams[1]), !Convert.ToBoolean(cmdparams[2]));
257 }
258 }
259 else
260 {
261 m_console.Error("scene-debug <scripting> <collisions> <physics> (where inside <> is true/false)");
262 }
263 break;
264
265 case "help": 247 case "help":
266 m_console.Notice("alert - send alert to a designated user or all users."); 248 m_console.Notice("alert - send alert to a designated user or all users.");
267 m_console.Notice(" alert [First] [Last] [Message] - send an alert to a user. Case sensitive."); 249 m_console.Notice(" alert [First] [Last] [Message] - send an alert to a user. Case sensitive.");
@@ -273,8 +255,8 @@ namespace OpenSim
273 m_console.Notice("change-region [name] - sets the region that many of these commands affect."); 255 m_console.Notice("change-region [name] - sets the region that many of these commands affect.");
274 m_console.Notice("command-script [filename] - Execute command in a file."); 256 m_console.Notice("command-script [filename] - Execute command in a file.");
275 m_console.Notice("debug - debugging commands"); 257 m_console.Notice("debug - debugging commands");
276 m_console.Notice(" packet 0..255 - print incoming/outgoing packets (0=off)"); 258 m_console.Notice(" debug packet 0..255 - print incoming/outgoing packets (0=off)");
277 m_console.Notice("scene-debug [scripting] [collision] [physics] - Enable/Disable debug stuff, each can be True/False"); 259 m_console.Notice(" debug scene [scripting] [collision] [physics] - Enable/Disable debug stuff, each can be True/False");
278 m_console.Notice("edit-scale [prim name] [x] [y] [z] - resize given prim"); 260 m_console.Notice("edit-scale [prim name] [x] [y] [z] - resize given prim");
279 m_console.Notice("export-map [filename] - save image of world map"); 261 m_console.Notice("export-map [filename] - save image of world map");
280 m_console.Notice("force-update - force an update of prims in the scene"); 262 m_console.Notice("force-update - force an update of prims in the scene");
@@ -628,6 +610,34 @@ namespace OpenSim
628 610
629 break; 611 break;
630 612
613 case "scene":
614 if (args.Length == 4)
615 {
616 if (m_sceneManager.CurrentScene == null)
617 {
618 m_console.Error("CONSOLE", "Please use 'change-region <regioname>' first");
619 }
620 else
621 {
622 bool scriptingOn = !Convert.ToBoolean(args[1]);
623 bool collisionsOn = !Convert.ToBoolean(args[2]);
624 bool physicsOn = !Convert.ToBoolean(args[3]);
625 m_sceneManager.CurrentScene.SetSceneCoreDebug(scriptingOn, collisionsOn, physicsOn);
626
627 m_console.Notice(
628 "CONSOLE",
629 String.Format(
630 "Set debug scene scripting = {0}, collisions = {1}, physics = {2}",
631 !scriptingOn, !collisionsOn, !physicsOn));
632 }
633 }
634 else
635 {
636 m_console.Error("debug scene <scripting> <collisions> <physics> (where inside <> is true/false)");
637 }
638
639 break;
640
631 default: 641 default:
632 m_console.Error("Unknown debug"); 642 m_console.Error("Unknown debug");
633 break; 643 break;