diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 16 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneManager.cs | 2 |
2 files changed, 14 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index ec238ef..58aa26a 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -98,6 +98,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
98 | /// </summary> | 98 | /// </summary> |
99 | public class LLClientView : IClientAPI, IClientCore, IClientIM, IClientChat, IClientIPEndpoint, IStatsCollector | 99 | public class LLClientView : IClientAPI, IClientCore, IClientIM, IClientChat, IClientIPEndpoint, IStatsCollector |
100 | { | 100 | { |
101 | /// <value> | ||
102 | /// Debug packet level. At the moment, only 255 does anything (prints out all in and out packets). | ||
103 | /// </value> | ||
104 | protected int m_debugPacketLevel = 0; | ||
105 | |||
101 | #region Events | 106 | #region Events |
102 | 107 | ||
103 | public event GenericMessage OnGenericMessage; | 108 | public event GenericMessage OnGenericMessage; |
@@ -490,6 +495,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
490 | 495 | ||
491 | public void SetDebugPacketLevel(int newDebug) | 496 | public void SetDebugPacketLevel(int newDebug) |
492 | { | 497 | { |
498 | m_debugPacketLevel = newDebug; | ||
493 | } | 499 | } |
494 | 500 | ||
495 | #region Client Methods | 501 | #region Client Methods |
@@ -11080,7 +11086,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11080 | LLUDPServer.LogPacketHeader(false, m_circuitCode, 0, packet.Type, (ushort)packet.Length); | 11086 | LLUDPServer.LogPacketHeader(false, m_circuitCode, 0, packet.Type, (ushort)packet.Length); |
11081 | #endregion BinaryStats | 11087 | #endregion BinaryStats |
11082 | 11088 | ||
11083 | m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, true); | 11089 | OutPacket(packet, throttlePacketType, true); |
11084 | } | 11090 | } |
11085 | 11091 | ||
11086 | /// <summary> | 11092 | /// <summary> |
@@ -11093,6 +11099,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11093 | /// handles splitting manually</param> | 11099 | /// handles splitting manually</param> |
11094 | protected void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType, bool doAutomaticSplitting) | 11100 | protected void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType, bool doAutomaticSplitting) |
11095 | { | 11101 | { |
11102 | if (m_debugPacketLevel >= 255) | ||
11103 | m_log.DebugFormat("[CLIENT]: Packet OUT {0}", packet.Type); | ||
11104 | |||
11096 | m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, doAutomaticSplitting); | 11105 | m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, doAutomaticSplitting); |
11097 | } | 11106 | } |
11098 | 11107 | ||
@@ -11164,10 +11173,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11164 | /// <param name="Pack">OpenMetaverse.packet</param> | 11173 | /// <param name="Pack">OpenMetaverse.packet</param> |
11165 | public void ProcessInPacket(Packet Pack) | 11174 | public void ProcessInPacket(Packet Pack) |
11166 | { | 11175 | { |
11167 | // m_log.DebugFormat("[CLIENT]: Packet IN {0}", Pack); | 11176 | if (m_debugPacketLevel >= 255) |
11177 | m_log.DebugFormat("[CLIENT]: Packet IN {0}", Pack.Type); | ||
11168 | 11178 | ||
11169 | if (!ProcessPacketMethod(Pack)) | 11179 | if (!ProcessPacketMethod(Pack)) |
11170 | m_log.Warn("[CLIENT]: unhandled packet " + Pack); | 11180 | m_log.Warn("[CLIENT]: unhandled packet " + Pack.Type); |
11171 | 11181 | ||
11172 | PacketPool.Instance.ReturnPacket(Pack); | 11182 | PacketPool.Instance.ReturnPacket(Pack); |
11173 | } | 11183 | } |
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs index c2e3370..92c278e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneManager.cs +++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs | |||
@@ -422,7 +422,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
422 | 422 | ||
423 | if (!scenePresence.IsChildAgent) | 423 | if (!scenePresence.IsChildAgent) |
424 | { | 424 | { |
425 | m_log.ErrorFormat("Packet debug for {0} {1} set to {2}", | 425 | m_log.DebugFormat("Packet debug for {0} {1} set to {2}", |
426 | scenePresence.Firstname, | 426 | scenePresence.Firstname, |
427 | scenePresence.Lastname, | 427 | scenePresence.Lastname, |
428 | newDebug); | 428 | newDebug); |