diff options
author | Melanie | 2011-10-25 02:54:34 +0100 |
---|---|---|
committer | Melanie | 2011-10-25 02:54:34 +0100 |
commit | dc24ac4f20fb145885327609f9265aa212b9a1d2 (patch) | |
tree | 9e83a7f9245c8f1110ef8449eeb3059dfd5787a6 | |
parent | Merge commit '96ff2c63ed47e29a92cc79b6e8753d21e54da061' into bigmerge (diff) | |
parent | refactor: Make IClientAPI.DebugPacketFormat a property rather than a setter w... (diff) | |
download | opensim-SC-dc24ac4f20fb145885327609f9265aa212b9a1d2.zip opensim-SC-dc24ac4f20fb145885327609f9265aa212b9a1d2.tar.gz opensim-SC-dc24ac4f20fb145885327609f9265aa212b9a1d2.tar.bz2 opensim-SC-dc24ac4f20fb145885327609f9265aa212b9a1d2.tar.xz |
Merge commit '120114e96becc6fee1311300359dcefaf4013c0e' into bigmerge
Diffstat (limited to '')
6 files changed, 16 insertions, 28 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 0557fb6..925998f 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -1011,11 +1011,11 @@ namespace OpenSim.Framework | |||
1011 | event MuteListEntryRemove OnRemoveMuteListEntry; | 1011 | event MuteListEntryRemove OnRemoveMuteListEntry; |
1012 | event GodlikeMessage onGodlikeMessage; | 1012 | event GodlikeMessage onGodlikeMessage; |
1013 | event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; | 1013 | event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; |
1014 | 1014 | ||
1015 | /// <summary> | 1015 | /// <summary> |
1016 | /// Set the debug level at which packet output should be printed to console. | 1016 | /// Set the debug level at which packet output should be printed to console. |
1017 | /// </summary> | 1017 | /// </summary> |
1018 | void SetDebugPacketLevel(int newDebug); | 1018 | int DebugPacketLevel { get; set; } |
1019 | 1019 | ||
1020 | void InPacket(object NewPack); | 1020 | void InPacket(object NewPack); |
1021 | void ProcessInPacket(Packet NewPack); | 1021 | void ProcessInPacket(Packet NewPack); |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 6588f3d..de08f90 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -64,7 +64,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
64 | /// <value> | 64 | /// <value> |
65 | /// Debug packet level. See OpenSim.RegisterConsoleCommands() for more details. | 65 | /// Debug packet level. See OpenSim.RegisterConsoleCommands() for more details. |
66 | /// </value> | 66 | /// </value> |
67 | protected int m_debugPacketLevel = 0; | 67 | public int DebugPacketLevel { get; set; } |
68 | 68 | ||
69 | #region Events | 69 | #region Events |
70 | 70 | ||
@@ -487,11 +487,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
487 | RegisterLocalPacketHandlers(); | 487 | RegisterLocalPacketHandlers(); |
488 | } | 488 | } |
489 | 489 | ||
490 | public void SetDebugPacketLevel(int newDebug) | ||
491 | { | ||
492 | m_debugPacketLevel = newDebug; | ||
493 | } | ||
494 | |||
495 | #region Client Methods | 490 | #region Client Methods |
496 | 491 | ||
497 | 492 | ||
@@ -11715,25 +11710,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11715 | /// provide your own method.</param> | 11710 | /// provide your own method.</param> |
11716 | protected void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType, bool doAutomaticSplitting, UnackedPacketMethod method) | 11711 | protected void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType, bool doAutomaticSplitting, UnackedPacketMethod method) |
11717 | { | 11712 | { |
11718 | if (m_debugPacketLevel > 0) | 11713 | if (DebugPacketLevel > 0) |
11719 | { | 11714 | { |
11720 | bool logPacket = true; | 11715 | bool logPacket = true; |
11721 | 11716 | ||
11722 | if (m_debugPacketLevel <= 255 | 11717 | if (DebugPacketLevel <= 255 |
11723 | && (packet.Type == PacketType.SimStats || packet.Type == PacketType.SimulatorViewerTimeMessage)) | 11718 | && (packet.Type == PacketType.SimStats || packet.Type == PacketType.SimulatorViewerTimeMessage)) |
11724 | logPacket = false; | 11719 | logPacket = false; |
11725 | 11720 | ||
11726 | if (m_debugPacketLevel <= 200 | 11721 | if (DebugPacketLevel <= 200 |
11727 | && (packet.Type == PacketType.ImagePacket | 11722 | && (packet.Type == PacketType.ImagePacket |
11728 | || packet.Type == PacketType.ImageData | 11723 | || packet.Type == PacketType.ImageData |
11729 | || packet.Type == PacketType.LayerData | 11724 | || packet.Type == PacketType.LayerData |
11730 | || packet.Type == PacketType.CoarseLocationUpdate)) | 11725 | || packet.Type == PacketType.CoarseLocationUpdate)) |
11731 | logPacket = false; | 11726 | logPacket = false; |
11732 | 11727 | ||
11733 | if (m_debugPacketLevel <= 100 && (packet.Type == PacketType.AvatarAnimation || packet.Type == PacketType.ViewerEffect)) | 11728 | if (DebugPacketLevel <= 100 && (packet.Type == PacketType.AvatarAnimation || packet.Type == PacketType.ViewerEffect)) |
11734 | logPacket = false; | 11729 | logPacket = false; |
11735 | 11730 | ||
11736 | if (m_debugPacketLevel <= 50 && packet.Type == PacketType.ImprovedTerseObjectUpdate) | 11731 | if (DebugPacketLevel <= 50 && packet.Type == PacketType.ImprovedTerseObjectUpdate) |
11737 | logPacket = false; | 11732 | logPacket = false; |
11738 | 11733 | ||
11739 | if (logPacket) | 11734 | if (logPacket) |
@@ -11778,17 +11773,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11778 | /// <param name="Pack">OpenMetaverse.packet</param> | 11773 | /// <param name="Pack">OpenMetaverse.packet</param> |
11779 | public void ProcessInPacket(Packet packet) | 11774 | public void ProcessInPacket(Packet packet) |
11780 | { | 11775 | { |
11781 | if (m_debugPacketLevel > 0) | 11776 | if (DebugPacketLevel > 0) |
11782 | { | 11777 | { |
11783 | bool outputPacket = true; | 11778 | bool outputPacket = true; |
11784 | 11779 | ||
11785 | if (m_debugPacketLevel <= 255 && packet.Type == PacketType.AgentUpdate) | 11780 | if (DebugPacketLevel <= 255 && packet.Type == PacketType.AgentUpdate) |
11786 | outputPacket = false; | 11781 | outputPacket = false; |
11787 | 11782 | ||
11788 | if (m_debugPacketLevel <= 200 && packet.Type == PacketType.RequestImage) | 11783 | if (DebugPacketLevel <= 200 && packet.Type == PacketType.RequestImage) |
11789 | outputPacket = false; | 11784 | outputPacket = false; |
11790 | 11785 | ||
11791 | if (m_debugPacketLevel <= 100 && (packet.Type == PacketType.ViewerEffect || packet.Type == PacketType.AgentAnimation)) | 11786 | if (DebugPacketLevel <= 100 && (packet.Type == PacketType.ViewerEffect || packet.Type == PacketType.AgentAnimation)) |
11792 | outputPacket = false; | 11787 | outputPacket = false; |
11793 | 11788 | ||
11794 | if (outputPacket) | 11789 | if (outputPacket) |
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs index 7fada4b..c91744c 100644 --- a/OpenSim/Region/Framework/Scenes/SceneManager.cs +++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs | |||
@@ -466,7 +466,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
466 | scenePresence.Lastname, | 466 | scenePresence.Lastname, |
467 | newDebug); | 467 | newDebug); |
468 | 468 | ||
469 | scenePresence.ControllingClient.SetDebugPacketLevel(newDebug); | 469 | scenePresence.ControllingClient.DebugPacketLevel = newDebug; |
470 | } | 470 | } |
471 | }); | 471 | }); |
472 | } | 472 | } |
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index a3b65cf..9fa243e 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
@@ -867,10 +867,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
867 | 867 | ||
868 | #pragma warning restore 67 | 868 | #pragma warning restore 67 |
869 | 869 | ||
870 | public void SetDebugPacketLevel(int newDebug) | 870 | public int DebugPacketLevel { get; set; } |
871 | { | ||
872 | |||
873 | } | ||
874 | 871 | ||
875 | public void InPacket(object NewPack) | 872 | public void InPacket(object NewPack) |
876 | { | 873 | { |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index fd2b9c7..a29ed21 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -823,9 +823,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
823 | { | 823 | { |
824 | } | 824 | } |
825 | 825 | ||
826 | public void SetDebugPacketLevel(int newDebug) | 826 | public int DebugPacketLevel { get; set; } |
827 | { | ||
828 | } | ||
829 | 827 | ||
830 | public void InPacket(object NewPack) | 828 | public void InPacket(object NewPack) |
831 | { | 829 | { |
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index e34721e..60a23f5 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -873,9 +873,7 @@ namespace OpenSim.Tests.Common.Mock | |||
873 | { | 873 | { |
874 | } | 874 | } |
875 | 875 | ||
876 | public void SetDebugPacketLevel(int newDebug) | 876 | public int DebugPacketLevel { get; set; } |
877 | { | ||
878 | } | ||
879 | 877 | ||
880 | public void InPacket(object NewPack) | 878 | public void InPacket(object NewPack) |
881 | { | 879 | { |