Remove recent optional native collision frame milliseconds stat

Unnecessary since this has now been broken down into space collisions and geom collisions
0.7.3-extended
Justin Clark-Casey (justincc) 2012-06-01 02:35:11 +01:00
parent 54a23f14d5
commit 2eb563b3bb
1 changed files with 1 additions and 13 deletions

View File

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