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

* Fixed a null NewPack error in ClientView.InPacket (object pool returning null objects?)

afrisby
Teravus Ovares 2007-12-20 14:44:59 +00:00
parent 76255c4793
commit 2641f78a20
2 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/ClientStack/ClientView.cs
View File

@ -2217,6 +2217,8 @@ namespace OpenSim.Region.ClientStack
public virtual void InPacket(Packet NewPack) public virtual void InPacket(Packet NewPack)
{ {
// Handle appended ACKs // Handle appended ACKs
if (NewPack != null)
{
if (NewPack.Header.AppendedAcks) if (NewPack.Header.AppendedAcks)
{ {
lock (m_needAck) lock (m_needAck)
@ -2228,6 +2230,7 @@ namespace OpenSim.Region.ClientStack
} }
} }
// Handle PacketAck packets // Handle PacketAck packets
if (NewPack.Type == PacketType.PacketAck) if (NewPack.Type == PacketType.PacketAck)
{ {
@ -2257,6 +2260,7 @@ namespace OpenSim.Region.ClientStack
m_packetQueue.Enqueue(item); m_packetQueue.Enqueue(item);
} }
} }
}
public virtual void OutPacket(Packet NewPack, ThrottleOutPacketType throttlePacketType) public virtual void OutPacket(Packet NewPack, ThrottleOutPacketType throttlePacketType)
{ {

5
OpenSim/Region/Environment/LandManagement/LandManager.cs
View File

@ -242,6 +242,9 @@ namespace OpenSim.Region.Environment.LandManagement
if (x >= 64 || y >= 64 || x < 0 || y < 0) if (x >= 64 || y >= 64 || x < 0 || y < 0)
{ {
// These exceptions here will cause a lot of complaints from the users specifically because
// they happen every time at border crossings
throw new Exception("Error: Parcel not found at point " + x + ", " + y); throw new Exception("Error: Parcel not found at point " + x + ", " + y);
} }
else else
@ -255,6 +258,8 @@ namespace OpenSim.Region.Environment.LandManagement
{ {
if (x >= 256 || y >= 256 || x < 0 || y < 0) if (x >= 256 || y >= 256 || x < 0 || y < 0)
{ {
// These exceptions here will cause a lot of complaints from the users specifically because
// they happen every time at border crossings
throw new Exception("Error: Parcel not found at point " + x + ", " + y); throw new Exception("Error: Parcel not found at point " + x + ", " + y);
} }
else else