From d1b5f8d9d76e3c7c4c23f485dd070e3775e8e85f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 1 Jun 2012 02:35:11 +0100
Subject: 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 0b9ad61..948930b 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@@ -156,11 +156,6 @@ namespace OpenSim.Region.Physics.OdePlugin
public const string ODENativeStepFrameMsStatName = "ODENativeStepFrameMS";
///
- /// Stat name for the number of milliseconds that ODE spends in native collision code.
- ///
- public const string ODENativeCollisionFrameMsStatName = "ODENativeCollisionFrameMS";
-
- ///
/// Stat name for the number of milliseconds that ODE spends in native space collision code.
///
public const string ODENativeSpaceCollisionFrameMsStatName = "ODENativeSpaceCollisionFrameMS";
@@ -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(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;
--
cgit v1.1