OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Eliminated unnecessary parameters from LLUDPServer.SendPacketData() 

* Changed PrimMesher's Quat.Identity to return <0,0,0,1> instead of <0,0,0,1.1>
prioritization
John Hurliman 2009-10-13 10:38:35 -07:00
parent 170d2c4660
commit 3828b3c0e8
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
View File

@ -210,7 +210,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
byte[] data = datas[i]; byte[] data = datas[i];
m_clients.ForEach( m_clients.ForEach(
delegate(LLUDPClient client) delegate(LLUDPClient client)
{ SendPacketData(client, data, data.Length, packet.Type, packet.Header.Zerocoded, category); }); { SendPacketData(client, data, packet.Type, category); });
} }
} }
else else
@ -218,7 +218,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
byte[] data = packet.ToBytes(); byte[] data = packet.ToBytes();
m_clients.ForEach( m_clients.ForEach(
delegate(LLUDPClient client) delegate(LLUDPClient client)
{ SendPacketData(client, data, data.Length, packet.Type, packet.Header.Zerocoded, category); }); { SendPacketData(client, data, packet.Type, category); });
} }
} }
@ -239,18 +239,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
for (int i = 0; i < packetCount; i++) for (int i = 0; i < packetCount; i++)
{ {
byte[] data = datas[i]; byte[] data = datas[i];
SendPacketData(client, data, data.Length, packet.Type, packet.Header.Zerocoded, category); SendPacketData(client, data, packet.Type, category);
} }
} }
else else
{ {
byte[] data = packet.ToBytes(); byte[] data = packet.ToBytes();
SendPacketData(client, data, data.Length, packet.Type, packet.Header.Zerocoded, category); SendPacketData(client, data, packet.Type, category);
} }
} }
public void SendPacketData(LLUDPClient client, byte[] data, int dataLength, PacketType type, bool doZerocode, ThrottleOutPacketType category) public void SendPacketData(LLUDPClient client, byte[] data, PacketType type, ThrottleOutPacketType category)
{ {
int dataLength = data.Length;
bool doZerocode = (data[0] & Helpers.MSG_ZEROCODED) != 0;
// Frequency analysis of outgoing packet sizes shows a large clump of packets at each end of the spectrum. // Frequency analysis of outgoing packet sizes shows a large clump of packets at each end of the spectrum.
// The vast majority of packets are less than 200 bytes, although due to asset transfers and packet splitting // The vast majority of packets are less than 200 bytes, although due to asset transfers and packet splitting
// there are a decent number of packets in the 1000-1140 byte range. We allocate one of two sizes of data here // there are a decent number of packets in the 1000-1140 byte range. We allocate one of two sizes of data here

2
OpenSim/Region/Physics/Meshing/PrimMesher.cs
View File

@ -69,7 +69,7 @@ namespace PrimMesher
public Quat Identity() public Quat Identity()
{ {
return new Quat(0.0f, 0.0f, 0.0f, 1.1f); return new Quat(0.0f, 0.0f, 0.0f, 1.0f);
} }
public float Length() public float Length()