SimClient: Added Try/Catch over block of code which is triggering an exception that should not be triggerable. (Duplicate key after dictionary is locked, checked for key, then added) [!?!?]

AvatarUpdate: Added check for if the physics actor is null before attempting to access it.

1 files changed, 11 insertions, 1 deletions

diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs
index e4c445b..d716bd6 100644
--- a/OpenSim.RegionServer/SimClient.cs
+++ b/OpenSim.RegionServer/SimClient.cs
@@ -731,7 +731,17 @@ namespace OpenSim
                     {

                         if (!NeedAck.ContainsKey(Pack.Header.Sequence))

                         {

-                            NeedAck.Add(Pack.Header.Sequence, Pack);

+                            try

+                            {

+                                NeedAck.Add(Pack.Header.Sequence, Pack);

+                            }

+                            catch (Exception e)

+                            {

+                                // Ignore

+                                // Seems to throw a exception here occasionally

+                                // of 'duplicate key' despite being locked.

+                                // !?!?!?

+                            }

                         }

                         else

                         {