diff options
author | Justin Clark-Casey (justincc) | 2010-12-17 22:29:43 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-12-17 22:29:43 +0000 |
commit | 0913d43c50ada932bc7def6109812575692277cf (patch) | |
tree | da94e3709f03b7423ef8dad03f337f68cdf1a751 /OpenSim/Region | |
parent | tidy up the [Groups] section in OpenSim.ini.example (diff) | |
download | opensim-SC_OLD-0913d43c50ada932bc7def6109812575692277cf.zip opensim-SC_OLD-0913d43c50ada932bc7def6109812575692277cf.tar.gz opensim-SC_OLD-0913d43c50ada932bc7def6109812575692277cf.tar.bz2 opensim-SC_OLD-0913d43c50ada932bc7def6109812575692277cf.tar.xz |
minor: 'debug packet' console command level <= 50 then don't log ImprovedTerseObjectUpdate messages
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 13 |
2 files changed, 10 insertions, 6 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index c2dd84c..e3b8573 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -220,10 +220,11 @@ namespace OpenSim | |||
220 | m_console.Commands.AddCommand("region", false, "debug packet", | 220 | m_console.Commands.AddCommand("region", false, "debug packet", |
221 | "debug packet <level>", | 221 | "debug packet <level>", |
222 | "Turn on packet debugging", | 222 | "Turn on packet debugging", |
223 | "If level > 255 then all incoming and outgoing packets are logged.\n" | 223 | "If level > 255 then all incoming and outgoing packets are logged.\n" |
224 | + "If level <= 255 then incoming AgentUpdate and outgoing SimStats and SimulatorViewerTimeMessage packets are not logged.\n" | 224 | + "If level <= 255 then incoming AgentUpdate and outgoing SimStats and SimulatorViewerTimeMessage packets are not logged.\n" |
225 | + "If level <= 200 then incoming RequestImage and outgoing ImagePacket, ImageData, LayerData and CoarseLocationUpdate packets are not logged.\n" | 225 | + "If level <= 200 then incoming RequestImage and outgoing ImagePacket, ImageData, LayerData and CoarseLocationUpdate packets are not logged.\n" |
226 | + "If level <= 100 then incoming ViewerEffect and AgentAnimation and outgoing ViewerEffect and AvatarAnimation packets are not logged.\n" | 226 | + "If level <= 100 then incoming ViewerEffect and AgentAnimation and outgoing ViewerEffect and AvatarAnimation packets are not logged.\n" |
227 | + "If level <= 50 then outgoing ImprovedTerseObjectUpdate packets are not logged.\n" | ||
227 | + "If level <= 0 then no packets are logged.", | 228 | + "If level <= 0 then no packets are logged.", |
228 | Debug); | 229 | Debug); |
229 | 230 | ||
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 3b7328d..63469c8 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -11243,23 +11243,26 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11243 | { | 11243 | { |
11244 | if (m_debugPacketLevel > 0) | 11244 | if (m_debugPacketLevel > 0) |
11245 | { | 11245 | { |
11246 | bool outputPacket = true; | 11246 | bool logPacket = true; |
11247 | 11247 | ||
11248 | if (m_debugPacketLevel <= 255 | 11248 | if (m_debugPacketLevel <= 255 |
11249 | && (packet.Type == PacketType.SimStats || packet.Type == PacketType.SimulatorViewerTimeMessage)) | 11249 | && (packet.Type == PacketType.SimStats || packet.Type == PacketType.SimulatorViewerTimeMessage)) |
11250 | outputPacket = false; | 11250 | logPacket = false; |
11251 | 11251 | ||
11252 | if (m_debugPacketLevel <= 200 | 11252 | if (m_debugPacketLevel <= 200 |
11253 | && (packet.Type == PacketType.ImagePacket | 11253 | && (packet.Type == PacketType.ImagePacket |
11254 | || packet.Type == PacketType.ImageData | 11254 | || packet.Type == PacketType.ImageData |
11255 | || packet.Type == PacketType.LayerData | 11255 | || packet.Type == PacketType.LayerData |
11256 | || packet.Type == PacketType.CoarseLocationUpdate)) | 11256 | || packet.Type == PacketType.CoarseLocationUpdate)) |
11257 | outputPacket = false; | 11257 | logPacket = false; |
11258 | 11258 | ||
11259 | if (m_debugPacketLevel <= 100 && (packet.Type == PacketType.AvatarAnimation || packet.Type == PacketType.ViewerEffect)) | 11259 | if (m_debugPacketLevel <= 100 && (packet.Type == PacketType.AvatarAnimation || packet.Type == PacketType.ViewerEffect)) |
11260 | outputPacket = false; | 11260 | logPacket = false; |
11261 | |||
11262 | if (m_debugPacketLevel <= 50 && packet.Type == PacketType.ImprovedTerseObjectUpdate) | ||
11263 | logPacket = false; | ||
11261 | 11264 | ||
11262 | if (outputPacket) | 11265 | if (logPacket) |
11263 | m_log.DebugFormat("[CLIENT]: Packet OUT {0}", packet.Type); | 11266 | m_log.DebugFormat("[CLIENT]: Packet OUT {0}", packet.Type); |
11264 | } | 11267 | } |
11265 | 11268 | ||