From 2eb563b3bbe1586d3fb6d0f77ff046d3651699c5 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Fri, 1 Jun 2012 02:35:11 +0100
Subject: [PATCH] Remove recent optional native collision frame milliseconds
 stat

Unnecessary since this has now been broken down into space collisions and geom collisions
---
 OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
index 0b9ad614b6..948930bf39 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@@ -155,11 +155,6 @@ namespace OpenSim.Region.Physics.OdePlugin
         /// </summary>
         public const string ODENativeStepFrameMsStatName = "ODENativeStepFrameMS";
 
-        /// <summary>
-        /// Stat name for the number of milliseconds that ODE spends in native collision code.
-        /// </summary>
-        public const string ODENativeCollisionFrameMsStatName = "ODENativeCollisionFrameMS";
-
         /// <summary>
         /// Stat name for the number of milliseconds that ODE spends in native space collision code.
         /// </summary>
@@ -3035,7 +3030,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                         {
                             m_stats[ODECollisionNotificationFrameMsStatName]
                                 += Util.EnvironmentTickCountSubtract(tempTick);
-                            
+
                             tempTick = Util.EnvironmentTickCount();
                         }
 
@@ -4149,10 +4144,6 @@ namespace OpenSim.Region.Physics.OdePlugin
             {
                 returnStats = new Dictionary<string, float>(m_stats);
 
-                returnStats[ODENativeCollisionFrameMsStatName]
-                    = returnStats[ODENativeSpaceCollisionFrameMsStatName]
-                        + returnStats[ODENativeGeomCollisionFrameMsStatName];
-
                 InitializeExtraStats();
             }
 
@@ -4161,9 +4152,6 @@ namespace OpenSim.Region.Physics.OdePlugin
 
         private void InitializeExtraStats()
         {
-            // No need to zero since this is calculated by addition
-            // m_stats[ODENativeCollisionFrameMsStatName] = 0;
-
             m_stats[ODETotalFrameMsStatName] = 0;
             m_stats[ODENativeStepFrameMsStatName] = 0;
             m_stats[ODENativeSpaceCollisionFrameMsStatName] = 0;