diff --git a/.nant/local.include b/.nant/local.include
index 3db063b3b2..6f0a362612 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -95,11 +95,6 @@
-
-
-
-
-
@@ -160,17 +155,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index ec238ef37e..58aa26a788 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -98,6 +98,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
///
public class LLClientView : IClientAPI, IClientCore, IClientIM, IClientChat, IClientIPEndpoint, IStatsCollector
{
+ ///
+ /// Debug packet level. At the moment, only 255 does anything (prints out all in and out packets).
+ ///
+ protected int m_debugPacketLevel = 0;
+
#region Events
public event GenericMessage OnGenericMessage;
@@ -490,6 +495,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public void SetDebugPacketLevel(int newDebug)
{
+ m_debugPacketLevel = newDebug;
}
#region Client Methods
@@ -11080,7 +11086,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
LLUDPServer.LogPacketHeader(false, m_circuitCode, 0, packet.Type, (ushort)packet.Length);
#endregion BinaryStats
- m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, true);
+ OutPacket(packet, throttlePacketType, true);
}
///
@@ -11093,6 +11099,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// handles splitting manually
protected void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType, bool doAutomaticSplitting)
{
+ if (m_debugPacketLevel >= 255)
+ m_log.DebugFormat("[CLIENT]: Packet OUT {0}", packet.Type);
+
m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, doAutomaticSplitting);
}
@@ -11164,10 +11173,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// OpenMetaverse.packet
public void ProcessInPacket(Packet Pack)
{
-// m_log.DebugFormat("[CLIENT]: Packet IN {0}", Pack);
+ if (m_debugPacketLevel >= 255)
+ m_log.DebugFormat("[CLIENT]: Packet IN {0}", Pack.Type);
if (!ProcessPacketMethod(Pack))
- m_log.Warn("[CLIENT]: unhandled packet " + Pack);
+ m_log.Warn("[CLIENT]: unhandled packet " + Pack.Type);
PacketPool.Instance.ReturnPacket(Pack);
}
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index c2e3370eb0..92c278e4a6 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -422,7 +422,7 @@ namespace OpenSim.Region.Framework.Scenes
if (!scenePresence.IsChildAgent)
{
- m_log.ErrorFormat("Packet debug for {0} {1} set to {2}",
+ m_log.DebugFormat("Packet debug for {0} {1} set to {2}",
scenePresence.Firstname,
scenePresence.Lastname,
newDebug);