diff options
author | Melanie | 2010-09-03 03:37:18 +0100 |
---|---|---|
committer | Melanie | 2010-09-03 03:37:18 +0100 |
commit | 4e0d6e8e41cf25a8e8d8524d9d5e94ab0752fb00 (patch) | |
tree | 6ecae46c7c5d46d4eb5a5ed65c1a7a8b8b15cc04 /OpenSim/Region/ClientStack/LindenUDP | |
parent | Fix an issue with rezzing scripted objects. (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-4e0d6e8e41cf25a8e8d8524d9d5e94ab0752fb00.zip opensim-SC_OLD-4e0d6e8e41cf25a8e8d8524d9d5e94ab0752fb00.tar.gz opensim-SC_OLD-4e0d6e8e41cf25a8e8d8524d9d5e94ab0752fb00.tar.bz2 opensim-SC_OLD-4e0d6e8e41cf25a8e8d8524d9d5e94ab0752fb00.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 59 |
1 files changed, 41 insertions, 18 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index aa7de05..a1cd30a 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -60,7 +60,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
60 | public class LLClientView : IClientAPI, IClientCore, IClientIM, IClientChat, IClientIPEndpoint, IStatsCollector | 60 | public class LLClientView : IClientAPI, IClientCore, IClientIM, IClientChat, IClientIPEndpoint, IStatsCollector |
61 | { | 61 | { |
62 | /// <value> | 62 | /// <value> |
63 | /// Debug packet level. At the moment, only 255 does anything (prints out all in and out packets). | 63 | /// Debug packet level. See OpenSim.RegisterConsoleCommands() for more details. |
64 | /// </value> | 64 | /// </value> |
65 | protected int m_debugPacketLevel = 0; | 65 | protected int m_debugPacketLevel = 0; |
66 | 66 | ||
@@ -11229,8 +11229,28 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11229 | /// handles splitting manually</param> | 11229 | /// handles splitting manually</param> |
11230 | protected void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType, bool doAutomaticSplitting) | 11230 | protected void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType, bool doAutomaticSplitting) |
11231 | { | 11231 | { |
11232 | if (m_debugPacketLevel >= 255) | 11232 | if (m_debugPacketLevel > 0) |
11233 | m_log.DebugFormat("[CLIENT]: Packet OUT {0}", packet.Type); | 11233 | { |
11234 | bool outputPacket = true; | ||
11235 | |||
11236 | if (m_debugPacketLevel <= 255 | ||
11237 | && (packet.Type == PacketType.SimStats || packet.Type == PacketType.SimulatorViewerTimeMessage)) | ||
11238 | outputPacket = false; | ||
11239 | |||
11240 | if (m_debugPacketLevel <= 200 | ||
11241 | && | ||
11242 | (packet.Type == PacketType.ImagePacket | ||
11243 | || packet.Type == PacketType.ImageData | ||
11244 | || packet.Type == PacketType.LayerData | ||
11245 | || packet.Type == PacketType.CoarseLocationUpdate)) | ||
11246 | outputPacket = false; | ||
11247 | |||
11248 | if (m_debugPacketLevel <= 100 && (packet.Type == PacketType.AvatarAnimation || packet.Type == PacketType.ViewerEffect)) | ||
11249 | outputPacket = false; | ||
11250 | |||
11251 | if (outputPacket) | ||
11252 | m_log.DebugFormat("[CLIENT]: Packet OUT {0}", packet.Type); | ||
11253 | } | ||
11234 | 11254 | ||
11235 | m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, doAutomaticSplitting); | 11255 | m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, doAutomaticSplitting); |
11236 | } | 11256 | } |
@@ -11316,26 +11336,29 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11316 | /// Entryway from the client to the simulator. All UDP packets from the client will end up here | 11336 | /// Entryway from the client to the simulator. All UDP packets from the client will end up here |
11317 | /// </summary> | 11337 | /// </summary> |
11318 | /// <param name="Pack">OpenMetaverse.packet</param> | 11338 | /// <param name="Pack">OpenMetaverse.packet</param> |
11319 | public void ProcessInPacket(Packet Pack) | 11339 | public void ProcessInPacket(Packet packet) |
11320 | { | 11340 | { |
11321 | if (!m_IsPresenceReady) | 11341 | if (m_debugPacketLevel > 0) |
11322 | { | 11342 | { |
11323 | if (m_pendingPackets == null) | 11343 | bool outputPacket = true; |
11324 | { | 11344 | |
11325 | m_pendingPackets = new List<Packet>(); | 11345 | if (m_debugPacketLevel <= 255 && packet.Type == PacketType.AgentUpdate) |
11326 | } | 11346 | outputPacket = false; |
11327 | m_pendingPackets.Add(Pack); | 11347 | |
11348 | if (m_debugPacketLevel <= 200 && packet.Type == PacketType.RequestImage) | ||
11349 | outputPacket = false; | ||
11350 | |||
11351 | if (m_debugPacketLevel <= 100 && (packet.Type == PacketType.ViewerEffect || packet.Type == PacketType.AgentAnimation)) | ||
11352 | outputPacket = false; | ||
11353 | |||
11354 | if (outputPacket) | ||
11355 | m_log.DebugFormat("[CLIENT]: Packet IN {0}", packet.Type); | ||
11328 | } | 11356 | } |
11329 | else | ||
11330 | { | ||
11331 | if (m_debugPacketLevel >= 255) | ||
11332 | m_log.DebugFormat("[CLIENT]: Packet IN {0}", Pack.Type); | ||
11333 | 11357 | ||
11334 | if (!ProcessPacketMethod(Pack)) | 11358 | if (!ProcessPacketMethod(packet)) |
11335 | m_log.Warn("[CLIENT]: unhandled packet " + Pack.Type); | 11359 | m_log.Warn("[CLIENT]: unhandled packet " + packet.Type); |
11336 | 11360 | ||
11337 | PacketPool.Instance.ReturnPacket(Pack); | 11361 | PacketPool.Instance.ReturnPacket(packet); |
11338 | } | ||
11339 | } | 11362 | } |
11340 | 11363 | ||
11341 | private static PrimitiveBaseShape GetShapeFromAddPacket(ObjectAddPacket addPacket) | 11364 | private static PrimitiveBaseShape GetShapeFromAddPacket(ObjectAddPacket addPacket) |