aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2012-05-17 13:13:31 +0100
committerUbitUmarov2012-05-17 13:13:31 +0100
commit7652b3a957f4e124c5142a3480fcc09a97e08be9 (patch)
treeef78c693642457c8627af063759daf7a2e8fbe0c
parent trigger collision sounds on active agent position for better spatial effect ... (diff)
downloadopensim-SC-7652b3a957f4e124c5142a3480fcc09a97e08be9.zip
opensim-SC-7652b3a957f4e124c5142a3480fcc09a97e08be9.tar.gz
opensim-SC-7652b3a957f4e124c5142a3480fcc09a97e08be9.tar.bz2
opensim-SC-7652b3a957f4e124c5142a3480fcc09a97e08be9.tar.xz
udp transfer: make number packets estimation coerent with number actually sent. Use the safer lower max packet size defined in os source (600) and not OMV one (1100).
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs10
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 7db6014..2d46a5b 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -329,6 +329,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
329 private Prioritizer m_prioritizer; 329 private Prioritizer m_prioritizer;
330 private bool m_disableFacelights = false; 330 private bool m_disableFacelights = false;
331 331
332 private const uint MaxTransferBytesPerPacket = 600;
333
334
332 /// <value> 335 /// <value>
333 /// List used in construction of data blocks for an object update packet. This is to stop us having to 336 /// List used in construction of data blocks for an object update packet. This is to stop us having to
334 /// continually recreate it. 337 /// continually recreate it.
@@ -2738,7 +2741,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2738 else 2741 else
2739 { 2742 {
2740 int processedLength = 0; 2743 int processedLength = 0;
2741 int maxChunkSize = Settings.MAX_PACKET_SIZE - 100; 2744// int maxChunkSize = Settings.MAX_PACKET_SIZE - 100;
2745
2746 int maxChunkSize = (int) MaxTransferBytesPerPacket;
2742 int packetNumber = 0; 2747 int packetNumber = 0;
2743 2748
2744 while (processedLength < req.AssetInf.Data.Length) 2749 while (processedLength < req.AssetInf.Data.Length)
@@ -12202,7 +12207,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
12202 /// <returns></returns> 12207 /// <returns></returns>
12203 private static int CalculateNumPackets(byte[] data) 12208 private static int CalculateNumPackets(byte[] data)
12204 { 12209 {
12205 const uint m_maxPacketSize = 600; 12210// const uint m_maxPacketSize = 600;
12211 uint m_maxPacketSize = MaxTransferBytesPerPacket;
12206 int numPackets = 1; 12212 int numPackets = 1;
12207 12213
12208 if (data == null) 12214 if (data == null)