diff options
author | Justin Clark-Casey (justincc) | 2010-03-03 17:50:05 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-03-03 17:50:05 +0000 |
commit | 1c68ad2bba43b87e204cf6eafb7f0a31d3272c01 (patch) | |
tree | 96e43dfc67d3ce0fb25dbf180a85517263f77c00 /OpenSim/Region | |
parent | Added empty service URLs upon account creation. (diff) | |
download | opensim-SC-1c68ad2bba43b87e204cf6eafb7f0a31d3272c01.zip opensim-SC-1c68ad2bba43b87e204cf6eafb7f0a31d3272c01.tar.gz opensim-SC-1c68ad2bba43b87e204cf6eafb7f0a31d3272c01.tar.bz2 opensim-SC-1c68ad2bba43b87e204cf6eafb7f0a31d3272c01.tar.xz |
remove references to OpenSim.Framework.Commuications.Tests.dll since all relevant test code has been obsoleted
this allows the tests to pass on my local system
Diffstat (limited to 'OpenSim/Region')
-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 ef49205..569dc8d 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -97,6 +97,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
97 | /// </summary> | 97 | /// </summary> |
98 | public class LLClientView : IClientAPI, IClientCore, IClientIM, IClientChat, IClientIPEndpoint, IStatsCollector | 98 | public class LLClientView : IClientAPI, IClientCore, IClientIM, IClientChat, IClientIPEndpoint, IStatsCollector |
99 | { | 99 | { |
100 | /// <value> | ||
101 | /// Debug packet level. At the moment, only 255 does anything (prints out all in and out packets). | ||
102 | /// </value> | ||
103 | protected int m_debugPacketLevel = 0; | ||
104 | |||
100 | #region Events | 105 | #region Events |
101 | 106 | ||
102 | public event GenericMessage OnGenericMessage; | 107 | public event GenericMessage OnGenericMessage; |
@@ -472,6 +477,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
472 | 477 | ||
473 | public void SetDebugPacketLevel(int newDebug) | 478 | public void SetDebugPacketLevel(int newDebug) |
474 | { | 479 | { |
480 | m_debugPacketLevel = newDebug; | ||
475 | } | 481 | } |
476 | 482 | ||
477 | #region Client Methods | 483 | #region Client Methods |
@@ -10952,7 +10958,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
10952 | LLUDPServer.LogPacketHeader(false, m_circuitCode, 0, packet.Type, (ushort)packet.Length); | 10958 | LLUDPServer.LogPacketHeader(false, m_circuitCode, 0, packet.Type, (ushort)packet.Length); |
10953 | #endregion BinaryStats | 10959 | #endregion BinaryStats |
10954 | 10960 | ||
10955 | m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, true); | 10961 | OutPacket(packet, throttlePacketType, true); |
10956 | } | 10962 | } |
10957 | 10963 | ||
10958 | /// <summary> | 10964 | /// <summary> |
@@ -10965,6 +10971,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
10965 | /// handles splitting manually</param> | 10971 | /// handles splitting manually</param> |
10966 | protected void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType, bool doAutomaticSplitting) | 10972 | protected void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType, bool doAutomaticSplitting) |
10967 | { | 10973 | { |
10974 | if (m_debugPacketLevel >= 255) | ||
10975 | m_log.DebugFormat("[CLIENT]: Packet OUT {0}", packet.Type); | ||
10976 | |||
10968 | m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, doAutomaticSplitting); | 10977 | m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, doAutomaticSplitting); |
10969 | } | 10978 | } |
10970 | 10979 | ||
@@ -11036,10 +11045,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11036 | /// <param name="Pack">OpenMetaverse.packet</param> | 11045 | /// <param name="Pack">OpenMetaverse.packet</param> |
11037 | public void ProcessInPacket(Packet Pack) | 11046 | public void ProcessInPacket(Packet Pack) |
11038 | { | 11047 | { |
11039 | // m_log.DebugFormat("[CLIENT]: Packet IN {0}", Pack); | 11048 | if (m_debugPacketLevel >= 255) |
11049 | m_log.DebugFormat("[CLIENT]: Packet IN {0}", Pack.Type); | ||
11040 | 11050 | ||
11041 | if (!ProcessPacketMethod(Pack)) | 11051 | if (!ProcessPacketMethod(Pack)) |
11042 | m_log.Warn("[CLIENT]: unhandled packet " + Pack); | 11052 | m_log.Warn("[CLIENT]: unhandled packet " + Pack.Type); |
11043 | 11053 | ||
11044 | PacketPool.Instance.ReturnPacket(Pack); | 11054 | PacketPool.Instance.ReturnPacket(Pack); |
11045 | } | 11055 | } |
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs index 6395d98..680c39a 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); |