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

2008-01-16 06:04:33 +00:00 · 2008-01-16 06:04:33 +00:00 · 29c869fd33
parent 5dd741267e
commit 29c869fd33
1 changed files with 13 additions and 2 deletions
--- 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!
+                                }
+                            }
                        }
                    }
                }