aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs13
-rw-r--r--OpenSim/Region/Physics/Meshing/PrimMesher.cs2
2 files changed, 9 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index fcb2cd0..07764cb 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -210,7 +210,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
210 byte[] data = datas[i]; 210 byte[] data = datas[i];
211 m_clients.ForEach( 211 m_clients.ForEach(
212 delegate(LLUDPClient client) 212 delegate(LLUDPClient client)
213 { SendPacketData(client, data, data.Length, packet.Type, packet.Header.Zerocoded, category); }); 213 { SendPacketData(client, data, packet.Type, category); });
214 } 214 }
215 } 215 }
216 else 216 else
@@ -218,7 +218,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
218 byte[] data = packet.ToBytes(); 218 byte[] data = packet.ToBytes();
219 m_clients.ForEach( 219 m_clients.ForEach(
220 delegate(LLUDPClient client) 220 delegate(LLUDPClient client)
221 { SendPacketData(client, data, data.Length, packet.Type, packet.Header.Zerocoded, category); }); 221 { SendPacketData(client, data, packet.Type, category); });
222 } 222 }
223 } 223 }
224 224
@@ -239,18 +239,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
239 for (int i = 0; i < packetCount; i++) 239 for (int i = 0; i < packetCount; i++)
240 { 240 {
241 byte[] data = datas[i]; 241 byte[] data = datas[i];
242 SendPacketData(client, data, data.Length, packet.Type, packet.Header.Zerocoded, category); 242 SendPacketData(client, data, packet.Type, category);
243 } 243 }
244 } 244 }
245 else 245 else
246 { 246 {
247 byte[] data = packet.ToBytes(); 247 byte[] data = packet.ToBytes();
248 SendPacketData(client, data, data.Length, packet.Type, packet.Header.Zerocoded, category); 248 SendPacketData(client, data, packet.Type, category);
249 } 249 }
250 } 250 }
251 251
252 public void SendPacketData(LLUDPClient client, byte[] data, int dataLength, PacketType type, bool doZerocode, ThrottleOutPacketType category) 252 public void SendPacketData(LLUDPClient client, byte[] data, PacketType type, ThrottleOutPacketType category)
253 { 253 {
254 int dataLength = data.Length;
255 bool doZerocode = (data[0] & Helpers.MSG_ZEROCODED) != 0;
256
254 // Frequency analysis of outgoing packet sizes shows a large clump of packets at each end of the spectrum. 257 // Frequency analysis of outgoing packet sizes shows a large clump of packets at each end of the spectrum.
255 // The vast majority of packets are less than 200 bytes, although due to asset transfers and packet splitting 258 // The vast majority of packets are less than 200 bytes, although due to asset transfers and packet splitting
256 // there are a decent number of packets in the 1000-1140 byte range. We allocate one of two sizes of data here 259 // there are a decent number of packets in the 1000-1140 byte range. We allocate one of two sizes of data here
diff --git a/OpenSim/Region/Physics/Meshing/PrimMesher.cs b/OpenSim/Region/Physics/Meshing/PrimMesher.cs
index a283840..47ce615 100644
--- a/OpenSim/Region/Physics/Meshing/PrimMesher.cs
+++ b/OpenSim/Region/Physics/Meshing/PrimMesher.cs
@@ -69,7 +69,7 @@ namespace PrimMesher
69 69
70 public Quat Identity() 70 public Quat Identity()
71 { 71 {
72 return new Quat(0.0f, 0.0f, 0.0f, 1.1f); 72 return new Quat(0.0f, 0.0f, 0.0f, 1.0f);
73 } 73 }
74 74
75 public float Length() 75 public float Length()