Merge branch 'master' into careminster

This commit is contained in:
Melanie
2012-01-10 20:34:43 +00:00
4 changed files with 10 additions and 14 deletions

View File

@@ -253,7 +253,7 @@ namespace OpenSim
m_console.Commands.AddCommand("region", false, "debug teleport", "debug teleport", "Toggle teleport route debugging", Debug);
m_console.Commands.AddCommand("region", false, "debug scene",
"debug scene <cripting> <collisions> <physics>",
"debug scene <scripting> <collisions> <physics>",
"Turn on scene debugging", Debug);
m_console.Commands.AddCommand("region", false, "change region",