aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorMelanie2012-06-15 15:59:49 +0100
committerMelanie2012-06-15 15:59:49 +0100
commit32cc9c6094b335254e3e44d9d2695d44281d5496 (patch)
tree873704e740bda73f3c8178eae7944073790da505 /OpenSim/Region/Application
parentMerge branch 'avination' into careminster (diff)
parentAdd region name to UseCircuitCode log messages (diff)
downloadopensim-SC-32cc9c6094b335254e3e44d9d2695d44281d5496.zip
opensim-SC-32cc9c6094b335254e3e44d9d2695d44281d5496.tar.gz
opensim-SC-32cc9c6094b335254e3e44d9d2695d44281d5496.tar.bz2
opensim-SC-32cc9c6094b335254e3e44d9d2695d44281d5496.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index f418d7b..9c952aa 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -238,7 +238,7 @@ namespace OpenSim
238 "Force the update of all objects on clients", 238 "Force the update of all objects on clients",
239 HandleForceUpdate); 239 HandleForceUpdate);
240 240
241 m_console.Commands.AddCommand("Comms", false, "debug packet", 241 m_console.Commands.AddCommand("Debug", false, "debug packet",
242 "debug packet <level> [<avatar-first-name> <avatar-last-name>]", 242 "debug packet <level> [<avatar-first-name> <avatar-last-name>]",
243 "Turn on packet debugging", 243 "Turn on packet debugging",
244 "If level > 255 then all incoming and outgoing packets are logged.\n" 244 "If level > 255 then all incoming and outgoing packets are logged.\n"
@@ -250,9 +250,9 @@ namespace OpenSim
250 + "If an avatar name is given then only packets from that avatar are logged", 250 + "If an avatar name is given then only packets from that avatar are logged",
251 Debug); 251 Debug);
252 252
253 m_console.Commands.AddCommand("Comms", false, "debug teleport", "debug teleport", "Toggle teleport route debugging", Debug); 253 m_console.Commands.AddCommand("Debug", false, "debug teleport", "debug teleport", "Toggle teleport route debugging", Debug);
254 254
255 m_console.Commands.AddCommand("Regions", false, "debug scene", 255 m_console.Commands.AddCommand("Debug", false, "debug scene",
256 "debug scene <scripting> <collisions> <physics>", 256 "debug scene <scripting> <collisions> <physics>",
257 "Turn on scene debugging", Debug); 257 "Turn on scene debugging", Debug);
258 258