aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/Servers/MainServer.cs2
-rw-r--r--OpenSim/Region/Application/OpenSim.cs6
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs2
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs8
-rw-r--r--OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs2
5 files changed, 10 insertions, 10 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"
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
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index 01ce194..0d7390b 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -106,7 +106,7 @@ namespace OpenSim.Region.ClientStack.Linden
106 scene.EventManager.OnRegisterCaps += OnRegisterCaps; 106 scene.EventManager.OnRegisterCaps += OnRegisterCaps;
107 107
108 MainConsole.Instance.Commands.AddCommand( 108 MainConsole.Instance.Commands.AddCommand(
109 "Comms", 109 "Debug",
110 false, 110 false,
111 "debug eq", 111 "debug eq",
112 "debug eq [0|1|2]", 112 "debug eq [0|1|2]",
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 22cc194..9cce725 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -986,8 +986,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
986 UseCircuitCodePacket uccp = (UseCircuitCodePacket)array[1]; 986 UseCircuitCodePacket uccp = (UseCircuitCodePacket)array[1];
987 987
988 m_log.DebugFormat( 988 m_log.DebugFormat(
989 "[LLUDPSERVER]: Handling UseCircuitCode request for circuit {0} from {1}", 989 "[LLUDPSERVER]: Handling UseCircuitCode request for circuit {0} to {1} from IP {2}",
990 uccp.CircuitCode.Code, buffer.RemoteEndPoint); 990 uccp.CircuitCode.Code, m_scene.RegionInfo.RegionName, buffer.RemoteEndPoint);
991 991
992 remoteEndPoint = (IPEndPoint)buffer.RemoteEndPoint; 992 remoteEndPoint = (IPEndPoint)buffer.RemoteEndPoint;
993 993
@@ -1016,8 +1016,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1016 { 1016 {
1017 // Don't create clients for unauthorized requesters. 1017 // Don't create clients for unauthorized requesters.
1018 m_log.WarnFormat( 1018 m_log.WarnFormat(
1019 "[LLUDPSERVER]: Connection request for client {0} connecting with unnotified circuit code {1} from {2}", 1019 "[LLUDPSERVER]: Ignoring connection request for {0} to {1} with unknown circuit code {2} from IP {3}",
1020 uccp.CircuitCode.ID, uccp.CircuitCode.Code, remoteEndPoint); 1020 uccp.CircuitCode.ID, m_scene.RegionInfo.RegionName, uccp.CircuitCode.Code, remoteEndPoint);
1021 } 1021 }
1022 1022
1023 // m_log.DebugFormat( 1023 // m_log.DebugFormat(
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 8c97f58..9a542a3 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -221,7 +221,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
221 "Force permissions on or off", 221 "Force permissions on or off",
222 HandleForcePermissions); 222 HandleForcePermissions);
223 223
224 m_scene.AddCommand("Users", this, "debug permissions", 224 m_scene.AddCommand("Debug", this, "debug permissions",
225 "debug permissions <true / false>", 225 "debug permissions <true / false>",
226 "Turn on permissions debugging", 226 "Turn on permissions debugging",
227 HandleDebugPermissions); 227 HandleDebugPermissions);