aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie2012-06-15 15:59:49 +0100
committerMelanie2012-06-15 15:59:49 +0100
commit32cc9c6094b335254e3e44d9d2695d44281d5496 (patch)
tree873704e740bda73f3c8178eae7944073790da505 /OpenSim/Framework
parentMerge branch 'avination' into careminster (diff)
parentAdd region name to UseCircuitCode log messages (diff)
downloadopensim-SC_OLD-32cc9c6094b335254e3e44d9d2695d44281d5496.zip
opensim-SC_OLD-32cc9c6094b335254e3e44d9d2695d44281d5496.tar.gz
opensim-SC_OLD-32cc9c6094b335254e3e44d9d2695d44281d5496.tar.bz2
opensim-SC_OLD-32cc9c6094b335254e3e44d9d2695d44281d5496.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Servers/MainServer.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/MainServer.cs b/OpenSim/Framework/Servers/MainServer.cs
index 07ff60c..8dc0e3a 100644
--- a/OpenSim/Framework/Servers/MainServer.cs
+++ b/OpenSim/Framework/Servers/MainServer.cs
@@ -105,7 +105,7 @@ namespace OpenSim.Framework.Servers
105 public static void RegisterHttpConsoleCommands(ICommandConsole console) 105 public static void RegisterHttpConsoleCommands(ICommandConsole console)
106 { 106 {
107 console.Commands.AddCommand( 107 console.Commands.AddCommand(
108 "Comms", false, "debug http", "debug http [<level>]", 108 "Debug", false, "debug http", "debug http [<level>]",
109 "Turn on inbound non-poll http request debugging.", 109 "Turn on inbound non-poll http request debugging.",
110 "If level <= 0, then no extra logging is done.\n" 110 "If level <= 0, then no extra logging is done.\n"
111 + "If level >= 1, then short warnings are logged when receiving bad input data.\n" 111 + "If level >= 1, then short warnings are logged when receiving bad input data.\n"