aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMelanie2010-12-17 22:50:25 +0000
committerMelanie2010-12-17 22:50:25 +0000
commita82112a47cc9285629fd11c5e75586532c26aef0 (patch)
tree48e2de146a91f31973578a6706188bf2d6477a11 /OpenSim/Region/ClientStack
parentFix notecards that end with an embedded object causing an exception (diff)
parentFix notecards that end with an embedded object causing an exception (diff)
downloadopensim-SC_OLD-a82112a47cc9285629fd11c5e75586532c26aef0.zip
opensim-SC_OLD-a82112a47cc9285629fd11c5e75586532c26aef0.tar.gz
opensim-SC_OLD-a82112a47cc9285629fd11c5e75586532c26aef0.tar.bz2
opensim-SC_OLD-a82112a47cc9285629fd11c5e75586532c26aef0.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs13
1 files changed, 8 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 04710f1..00a605e 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -11347,23 +11347,26 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11347 { 11347 {
11348 if (m_debugPacketLevel > 0) 11348 if (m_debugPacketLevel > 0)
11349 { 11349 {
11350 bool outputPacket = true; 11350 bool logPacket = true;
11351 11351
11352 if (m_debugPacketLevel <= 255 11352 if (m_debugPacketLevel <= 255
11353 && (packet.Type == PacketType.SimStats || packet.Type == PacketType.SimulatorViewerTimeMessage)) 11353 && (packet.Type == PacketType.SimStats || packet.Type == PacketType.SimulatorViewerTimeMessage))
11354 outputPacket = false; 11354 logPacket = false;
11355 11355
11356 if (m_debugPacketLevel <= 200 11356 if (m_debugPacketLevel <= 200
11357 && (packet.Type == PacketType.ImagePacket 11357 && (packet.Type == PacketType.ImagePacket
11358 || packet.Type == PacketType.ImageData 11358 || packet.Type == PacketType.ImageData
11359 || packet.Type == PacketType.LayerData 11359 || packet.Type == PacketType.LayerData
11360 || packet.Type == PacketType.CoarseLocationUpdate)) 11360 || packet.Type == PacketType.CoarseLocationUpdate))
11361 outputPacket = false; 11361 logPacket = false;
11362 11362
11363 if (m_debugPacketLevel <= 100 && (packet.Type == PacketType.AvatarAnimation || packet.Type == PacketType.ViewerEffect)) 11363 if (m_debugPacketLevel <= 100 && (packet.Type == PacketType.AvatarAnimation || packet.Type == PacketType.ViewerEffect))
11364 outputPacket = false; 11364 logPacket = false;
11365
11366 if (m_debugPacketLevel <= 50 && packet.Type == PacketType.ImprovedTerseObjectUpdate)
11367 logPacket = false;
11365 11368
11366 if (outputPacket) 11369 if (logPacket)
11367 m_log.DebugFormat("[CLIENT]: Packet OUT {0}", packet.Type); 11370 m_log.DebugFormat("[CLIENT]: Packet OUT {0}", packet.Type);
11368 } 11371 }
11369 11372