* Fix for: http://opensimulator.org/mantis/view.php?id=358

1 files changed, 13 insertions, 2 deletions

diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index c1f4126..e74aee7 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -2373,8 +2373,19 @@ namespace OpenSim.Region.ClientStack
                     {
                         foreach (PacketAckPacket.PacketsBlock block in ackPacket.Packets)
                         {
-                            m_unAckedBytes -= m_needAck[block.ID].ToBytes().Length;
-                            m_needAck.Remove(block.ID);
+                            if (m_needAck.ContainsKey(block.ID))
+                            {
+                                try
+                                {
+                                    m_unAckedBytes -= m_needAck[block.ID].ToBytes().Length;
+                                    m_needAck.Remove(block.ID);
+                                }
+                                catch (System.Collections.Generic.KeyNotFoundException)
+                                {
+                                    // Did another packet come in with the ack already?  
+                                    // apparently so!
+                                }
+                            }
                         }
                     }
                 }