diff options
| author | Justin Clark-Casey (justincc) | 2013-10-24 00:37:49 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-10-24 00:37:49 +0100 |
| commit | cccdfcb59eea7f8a43fe34ca55ff89b3317904f2 (patch) | |
| tree | 30456313638911871a717b8fff2ca47ec21ca743 | |
| parent | Only set the data present event if we actually queued an outoing packet (not ... (diff) | |
| download | opensim-SC_OLD-cccdfcb59eea7f8a43fe34ca55ff89b3317904f2.zip opensim-SC_OLD-cccdfcb59eea7f8a43fe34ca55ff89b3317904f2.tar.gz opensim-SC_OLD-cccdfcb59eea7f8a43fe34ca55ff89b3317904f2.tar.bz2 opensim-SC_OLD-cccdfcb59eea7f8a43fe34ca55ff89b3317904f2.tar.xz | |
Comment out LLUDPServer.BroadcastPacket() to reduce code complexity. Appears to be a never used method.
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index 981f7ef..218c2b2 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
| @@ -862,44 +862,44 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 862 | return x == m_location; | 862 | return x == m_location; |
| 863 | } | 863 | } |
| 864 | 864 | ||
| 865 | public void BroadcastPacket(Packet packet, ThrottleOutPacketType category, bool sendToPausedAgents, bool allowSplitting) | 865 | // public void BroadcastPacket(Packet packet, ThrottleOutPacketType category, bool sendToPausedAgents, bool allowSplitting) |
| 866 | { | 866 | // { |
| 867 | // CoarseLocationUpdate and AvatarGroupsReply packets cannot be split in an automated way | 867 | // // CoarseLocationUpdate and AvatarGroupsReply packets cannot be split in an automated way |
| 868 | if ((packet.Type == PacketType.CoarseLocationUpdate || packet.Type == PacketType.AvatarGroupsReply) && allowSplitting) | 868 | // if ((packet.Type == PacketType.CoarseLocationUpdate || packet.Type == PacketType.AvatarGroupsReply) && allowSplitting) |
| 869 | allowSplitting = false; | 869 | // allowSplitting = false; |
| 870 | 870 | // | |
| 871 | if (allowSplitting && packet.HasVariableBlocks) | 871 | // if (allowSplitting && packet.HasVariableBlocks) |
| 872 | { | 872 | // { |
| 873 | byte[][] datas = packet.ToBytesMultiple(); | 873 | // byte[][] datas = packet.ToBytesMultiple(); |
| 874 | int packetCount = datas.Length; | 874 | // int packetCount = datas.Length; |
| 875 | 875 | // | |
| 876 | if (packetCount < 1) | 876 | // if (packetCount < 1) |
| 877 | m_log.Error("[LLUDPSERVER]: Failed to split " + packet.Type + " with estimated length " + packet.Length); | 877 | // m_log.Error("[LLUDPSERVER]: Failed to split " + packet.Type + " with estimated length " + packet.Length); |
| 878 | 878 | // | |
| 879 | for (int i = 0; i < packetCount; i++) | 879 | // for (int i = 0; i < packetCount; i++) |
| 880 | { | 880 | // { |
| 881 | byte[] data = datas[i]; | 881 | // byte[] data = datas[i]; |
| 882 | m_scene.ForEachClient( | 882 | // m_scene.ForEachClient( |
| 883 | delegate(IClientAPI client) | 883 | // delegate(IClientAPI client) |
| 884 | { | 884 | // { |
| 885 | if (client is LLClientView) | 885 | // if (client is LLClientView) |
| 886 | SendPacketData(((LLClientView)client).UDPClient, data, packet.Type, category, null); | 886 | // SendPacketData(((LLClientView)client).UDPClient, data, packet.Type, category, null); |
| 887 | } | 887 | // } |
| 888 | ); | 888 | // ); |
| 889 | } | 889 | // } |
| 890 | } | 890 | // } |
| 891 | else | 891 | // else |
| 892 | { | 892 | // { |
| 893 | byte[] data = packet.ToBytes(); | 893 | // byte[] data = packet.ToBytes(); |
| 894 | m_scene.ForEachClient( | 894 | // m_scene.ForEachClient( |
| 895 | delegate(IClientAPI client) | 895 | // delegate(IClientAPI client) |
| 896 | { | 896 | // { |
| 897 | if (client is LLClientView) | 897 | // if (client is LLClientView) |
| 898 | SendPacketData(((LLClientView)client).UDPClient, data, packet.Type, category, null); | 898 | // SendPacketData(((LLClientView)client).UDPClient, data, packet.Type, category, null); |
| 899 | } | 899 | // } |
| 900 | ); | 900 | // ); |
| 901 | } | 901 | // } |
| 902 | } | 902 | // } |
| 903 | 903 | ||
| 904 | /// <summary> | 904 | /// <summary> |
| 905 | /// Start the process of sending a packet to the client. | 905 | /// Start the process of sending a packet to the client. |