From 5289b5c6bfefed739c5c69768a62fd4c48b62cd4 Mon Sep 17 00:00:00 2001
From: UbitUmarov <ajlduarte@sapo.pt>
Date: Thu, 21 Apr 2022 01:12:26 +0100
Subject: [PATCH] minor change on collision account

---
 .../Region/PhysicsModules/SharedBase/PhysicsActor.cs  | 11 +++++------
 OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs       |  1 -
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs
index c4e8e7e632..144d473c25 100644
--- a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs
+++ b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs
@@ -128,10 +128,10 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
 
         public void AddCollider(uint localID, ContactPoint contact)
         {
-            if (m_objCollisionList.ContainsKey(localID))
+            if (m_objCollisionList.TryGetValue(localID, out ContactPoint oldcp))
             {
-                float lastVel = m_objCollisionList[localID].RelativeSpeed;
-                if (m_objCollisionList[localID].PenetrationDepth < contact.PenetrationDepth)
+                float lastVel = oldcp.RelativeSpeed;
+                if (oldcp.PenetrationDepth < contact.PenetrationDepth)
                 {
                     if (Math.Abs(lastVel) > Math.Abs(contact.RelativeSpeed))
                         contact.RelativeSpeed = lastVel;
@@ -139,9 +139,8 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
                 }
                 else if (Math.Abs(lastVel) < Math.Abs(contact.RelativeSpeed))
                 {
-                    ContactPoint tmp = m_objCollisionList[localID];
-                    tmp.RelativeSpeed = contact.RelativeSpeed;
-                    m_objCollisionList[localID] = tmp;
+                    oldcp.RelativeSpeed = contact.RelativeSpeed;
+                    m_objCollisionList[localID] = oldcp;
                 }
             }
             else
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
index 9ae49aed4f..c835d390c3 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
@@ -1676,7 +1676,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                     }
                 }
 
-                
                 // information block for in debug breakpoint only
                 /*
                 int ntopactivegeoms = SafeNativeMethods.SpaceGetNumGeoms(ActiveSpace);