diff options
author | Melanie | 2013-01-11 02:13:10 +0000 |
---|---|---|
committer | Melanie | 2013-01-11 02:13:10 +0000 |
commit | f74915ed4f8831344ee588d9036b7ac866ea4294 (patch) | |
tree | 5f1021165cf4acc9043b3015c2aac468128fa1dc /OpenSim/Region/Application/OpenSim.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Fix a regression in the last few scene commands changes where setting these v... (diff) | |
download | opensim-SC_OLD-f74915ed4f8831344ee588d9036b7ac866ea4294.zip opensim-SC_OLD-f74915ed4f8831344ee588d9036b7ac866ea4294.tar.gz opensim-SC_OLD-f74915ed4f8831344ee588d9036b7ac866ea4294.tar.bz2 opensim-SC_OLD-f74915ed4f8831344ee588d9036b7ac866ea4294.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 08e4023..e1cff69 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -236,18 +236,6 @@ namespace OpenSim | |||
236 | + "If an avatar name is given then only packets from that avatar are logged", | 236 | + "If an avatar name is given then only packets from that avatar are logged", |
237 | Debug); | 237 | Debug); |
238 | 238 | ||
239 | m_console.Commands.AddCommand("Debug", false, "debug teleport", "debug teleport", "Toggle teleport route debugging", Debug); | ||
240 | |||
241 | m_console.Commands.AddCommand("Debug", false, "debug scene", | ||
242 | "debug scene active|collisions|physics|scripting|teleport true|false", | ||
243 | "Turn on scene debugging.", | ||
244 | "If active is false then main scene update and maintenance loops are suspended.\n" | ||
245 | + "If collisions is false then collisions with other objects are turned off.\n" | ||
246 | + "If physics is false then all physics objects are non-physical.\n" | ||
247 | + "If scripting is false then no scripting operations happen.\n" | ||
248 | + "If teleport is true then some extra teleport debug information is logged.", | ||
249 | Debug); | ||
250 | |||
251 | m_console.Commands.AddCommand("General", false, "change region", | 239 | m_console.Commands.AddCommand("General", false, "change region", |
252 | "change region <region name>", | 240 | "change region <region name>", |
253 | "Change current console region", ChangeSelectedRegion); | 241 | "Change current console region", ChangeSelectedRegion); |
@@ -744,31 +732,6 @@ namespace OpenSim | |||
744 | 732 | ||
745 | break; | 733 | break; |
746 | 734 | ||
747 | case "scene": | ||
748 | if (args.Length == 4) | ||
749 | { | ||
750 | if (SceneManager.CurrentScene == null) | ||
751 | { | ||
752 | MainConsole.Instance.Output("Please use 'change region <regioname>' first"); | ||
753 | } | ||
754 | else | ||
755 | { | ||
756 | string key = args[2]; | ||
757 | string value = args[3]; | ||
758 | SceneManager.CurrentScene.SetSceneCoreDebug( | ||
759 | new Dictionary<string, string>() { { key, value } }); | ||
760 | |||
761 | MainConsole.Instance.OutputFormat("Set debug scene {0} = {1}", key, value); | ||
762 | } | ||
763 | } | ||
764 | else | ||
765 | { | ||
766 | MainConsole.Instance.Output( | ||
767 | "Usage: debug scene active|scripting|collisions|physics|teleport true|false"); | ||
768 | } | ||
769 | |||
770 | break; | ||
771 | |||
772 | default: | 735 | default: |
773 | MainConsole.Instance.Output("Unknown debug command"); | 736 | MainConsole.Instance.Output("Unknown debug command"); |
774 | break; | 737 | break; |