OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '120114e96becc6fee1311300359dcefaf4013c0e' into bigmerge

avinationmerge
Melanie 2011-10-25 02:54:34 +01:00
parent 51fd5bac5e 120114e96b
commit dc24ac4f20
6 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/IClientAPI.cs
View File

@ -1015,7 +1015,7 @@ namespace OpenSim.Framework
/// <summary> /// <summary>
/// Set the debug level at which packet output should be printed to console. /// Set the debug level at which packet output should be printed to console.
/// </summary> /// </summary>
void SetDebugPacketLevel(int newDebug); int DebugPacketLevel { get; set; }
void InPacket(object NewPack); void InPacket(object NewPack);
void ProcessInPacket(Packet NewPack); void ProcessInPacket(Packet NewPack);

25
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -64,7 +64,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// <value> /// <value>
/// Debug packet level. See OpenSim.RegisterConsoleCommands() for more details. /// Debug packet level. See OpenSim.RegisterConsoleCommands() for more details.
/// </value> /// </value>
protected int m_debugPacketLevel = 0; public int DebugPacketLevel { get; set; }
#region Events #region Events
@ -487,11 +487,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
RegisterLocalPacketHandlers(); RegisterLocalPacketHandlers();
} }
public void SetDebugPacketLevel(int newDebug)
{
m_debugPacketLevel = newDebug;
}
#region Client Methods #region Client Methods
@ -11715,25 +11710,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// provide your own method.</param> /// provide your own method.</param>
protected void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType, bool doAutomaticSplitting, UnackedPacketMethod method) protected void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType, bool doAutomaticSplitting, UnackedPacketMethod method)
{ {
if (m_debugPacketLevel > 0) if (DebugPacketLevel > 0)
{ {
bool logPacket = true; bool logPacket = true;
if (m_debugPacketLevel <= 255 if (DebugPacketLevel <= 255
&& (packet.Type == PacketType.SimStats || packet.Type == PacketType.SimulatorViewerTimeMessage)) && (packet.Type == PacketType.SimStats || packet.Type == PacketType.SimulatorViewerTimeMessage))
logPacket = false; logPacket = false;
if (m_debugPacketLevel <= 200 if (DebugPacketLevel <= 200
&& (packet.Type == PacketType.ImagePacket && (packet.Type == PacketType.ImagePacket
|| packet.Type == PacketType.ImageData || packet.Type == PacketType.ImageData
|| packet.Type == PacketType.LayerData || packet.Type == PacketType.LayerData
|| packet.Type == PacketType.CoarseLocationUpdate)) || packet.Type == PacketType.CoarseLocationUpdate))
logPacket = false; logPacket = false;
if (m_debugPacketLevel <= 100 && (packet.Type == PacketType.AvatarAnimation || packet.Type == PacketType.ViewerEffect)) if (DebugPacketLevel <= 100 && (packet.Type == PacketType.AvatarAnimation || packet.Type == PacketType.ViewerEffect))
logPacket = false; logPacket = false;
if (m_debugPacketLevel <= 50 && packet.Type == PacketType.ImprovedTerseObjectUpdate) if (DebugPacketLevel <= 50 && packet.Type == PacketType.ImprovedTerseObjectUpdate)
logPacket = false; logPacket = false;
if (logPacket) if (logPacket)
@ -11778,17 +11773,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// <param name="Pack">OpenMetaverse.packet</param> /// <param name="Pack">OpenMetaverse.packet</param>
public void ProcessInPacket(Packet packet) public void ProcessInPacket(Packet packet)
{ {
if (m_debugPacketLevel > 0) if (DebugPacketLevel > 0)
{ {
bool outputPacket = true; bool outputPacket = true;
if (m_debugPacketLevel <= 255 && packet.Type == PacketType.AgentUpdate) if (DebugPacketLevel <= 255 && packet.Type == PacketType.AgentUpdate)
outputPacket = false; outputPacket = false;
if (m_debugPacketLevel <= 200 && packet.Type == PacketType.RequestImage) if (DebugPacketLevel <= 200 && packet.Type == PacketType.RequestImage)
outputPacket = false; outputPacket = false;
if (m_debugPacketLevel <= 100 && (packet.Type == PacketType.ViewerEffect || packet.Type == PacketType.AgentAnimation)) if (DebugPacketLevel <= 100 && (packet.Type == PacketType.ViewerEffect || packet.Type == PacketType.AgentAnimation))
outputPacket = false; outputPacket = false;
if (outputPacket) if (outputPacket)

2
OpenSim/Region/Framework/Scenes/SceneManager.cs
View File

@ -466,7 +466,7 @@ namespace OpenSim.Region.Framework.Scenes
scenePresence.Lastname, scenePresence.Lastname,
newDebug); newDebug);
scenePresence.ControllingClient.SetDebugPacketLevel(newDebug); scenePresence.ControllingClient.DebugPacketLevel = newDebug;
} }
}); });
} }

5
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
View File

@ -867,10 +867,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
#pragma warning restore 67 #pragma warning restore 67
public void SetDebugPacketLevel(int newDebug) public int DebugPacketLevel { get; set; }
{
}
public void InPacket(object NewPack) public void InPacket(object NewPack)
{ {

4
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
View File

@ -823,9 +823,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
{ {
} }
public void SetDebugPacketLevel(int newDebug) public int DebugPacketLevel { get; set; }
{
}
public void InPacket(object NewPack) public void InPacket(object NewPack)
{ {

4
OpenSim/Tests/Common/Mock/TestClient.cs
View File

@ -873,9 +873,7 @@ namespace OpenSim.Tests.Common.Mock
{ {
} }
public void SetDebugPacketLevel(int newDebug) public int DebugPacketLevel { get; set; }
{
}
public void InPacket(object NewPack) public void InPacket(object NewPack)
{ {