aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSim.cs
diff options
context:
space:
mode:
authorMelanie2012-01-10 20:34:43 +0000
committerMelanie2012-01-10 20:34:43 +0000
commita4c2e7f5997c74ae0006ff573f7576bfc6c1aa82 (patch)
treead7e9b44924581a13f04b6292e2be52e00bd7673 /OpenSim/Region/Application/OpenSim.cs
parentMerge branch 'master' into careminster (diff)
parentRemove DEBUG option (diff)
downloadopensim-SC_OLD-a4c2e7f5997c74ae0006ff573f7576bfc6c1aa82.zip
opensim-SC_OLD-a4c2e7f5997c74ae0006ff573f7576bfc6c1aa82.tar.gz
opensim-SC_OLD-a4c2e7f5997c74ae0006ff573f7576bfc6c1aa82.tar.bz2
opensim-SC_OLD-a4c2e7f5997c74ae0006ff573f7576bfc6c1aa82.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index adf653a..515567d 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -253,7 +253,7 @@ namespace OpenSim
253 m_console.Commands.AddCommand("region", false, "debug teleport", "debug teleport", "Toggle teleport route debugging", Debug); 253 m_console.Commands.AddCommand("region", false, "debug teleport", "debug teleport", "Toggle teleport route debugging", Debug);
254 254
255 m_console.Commands.AddCommand("region", false, "debug scene", 255 m_console.Commands.AddCommand("region", false, "debug scene",
256 "debug scene <cripting> <collisions> <physics>", 256 "debug scene <scripting> <collisions> <physics>",
257 "Turn on scene debugging", Debug); 257 "Turn on scene debugging", Debug);
258 258
259 m_console.Commands.AddCommand("region", false, "change region", 259 m_console.Commands.AddCommand("region", false, "change region",