From c33c8db8256225b5ec09c0767c8b65341964d678 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 1 Jun 2012 01:15:27 +0100
Subject: Rename new collision stats to 'contacts' - there are/can be multiple
contacts per collision and this is what is actually being measured.
---
OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
index 55c7e5a..32dac22 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@@ -150,12 +150,12 @@ namespace OpenSim.Region.Physics.OdePlugin
///
/// Stat name for the number of avatar collisions with another entity.
///
- public const string ODEAvatarCollisionsStatName = "ODEAvatarCollisions";
+ public const string ODEAvatarContactsStatsName = "ODEAvatarContacts";
///
/// Stat name for the number of prim collisions with another entity.
///
- public const string ODEPrimCollisionsStatName = "ODEPrimCollisions";
+ public const string ODEPrimContactsStatName = "ODEPrimContacts";
///
/// Used to hold tick numbers for stat collection purposes.
@@ -1707,7 +1707,7 @@ namespace OpenSim.Region.Physics.OdePlugin
if (CollectStats)
{
m_tempAvatarCollisionsThisFrame = _perloopContact.Count;
- m_stats[ODEAvatarCollisionsStatName] += m_tempAvatarCollisionsThisFrame;
+ m_stats[ODEAvatarContactsStatsName] += m_tempAvatarCollisionsThisFrame;
}
List removeprims = null;
@@ -1743,7 +1743,7 @@ namespace OpenSim.Region.Physics.OdePlugin
}
if (CollectStats)
- m_stats[ODEPrimCollisionsStatName] += _perloopContact.Count - m_tempAvatarCollisionsThisFrame;
+ m_stats[ODEPrimContactsStatName] += _perloopContact.Count - m_tempAvatarCollisionsThisFrame;
if (removeprims != null)
{
@@ -4089,8 +4089,8 @@ namespace OpenSim.Region.Physics.OdePlugin
private void InitializeExtraStats()
{
m_stats[ODENativeCollisionFrameMsStatName] = 0;
- m_stats[ODEAvatarCollisionsStatName] = 0;
- m_stats[ODEPrimCollisionsStatName] = 0;
+ m_stats[ODEAvatarContactsStatsName] = 0;
+ m_stats[ODEPrimContactsStatName] = 0;
}
}
}
\ No newline at end of file
--
cgit v1.1