aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-06-01 01:15:27 +0100
committerJustin Clark-Casey (justincc)2012-06-01 01:15:27 +0100
commitc33c8db8256225b5ec09c0767c8b65341964d678 (patch)
treeef1ca97ddec328ed12998cbb2a304a4709440368 /OpenSim/Region/Physics
parentStop adding an unnecessary duplicate _perloopcontact if the avatar is standin... (diff)
downloadopensim-SC-c33c8db8256225b5ec09c0767c8b65341964d678.zip
opensim-SC-c33c8db8256225b5ec09c0767c8b65341964d678.tar.gz
opensim-SC-c33c8db8256225b5ec09c0767c8b65341964d678.tar.bz2
opensim-SC-c33c8db8256225b5ec09c0767c8b65341964d678.tar.xz
Rename new collision stats to 'contacts' - there are/can be multiple contacts per collision and this is what is actually being measured.
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdeScene.cs12
1 files changed, 6 insertions, 6 deletions
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
150 /// <summary> 150 /// <summary>
151 /// Stat name for the number of avatar collisions with another entity. 151 /// Stat name for the number of avatar collisions with another entity.
152 /// </summary> 152 /// </summary>
153 public const string ODEAvatarCollisionsStatName = "ODEAvatarCollisions"; 153 public const string ODEAvatarContactsStatsName = "ODEAvatarContacts";
154 154
155 /// <summary> 155 /// <summary>
156 /// Stat name for the number of prim collisions with another entity. 156 /// Stat name for the number of prim collisions with another entity.
157 /// </summary> 157 /// </summary>
158 public const string ODEPrimCollisionsStatName = "ODEPrimCollisions"; 158 public const string ODEPrimContactsStatName = "ODEPrimContacts";
159 159
160 /// <summary> 160 /// <summary>
161 /// Used to hold tick numbers for stat collection purposes. 161 /// Used to hold tick numbers for stat collection purposes.
@@ -1707,7 +1707,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1707 if (CollectStats) 1707 if (CollectStats)
1708 { 1708 {
1709 m_tempAvatarCollisionsThisFrame = _perloopContact.Count; 1709 m_tempAvatarCollisionsThisFrame = _perloopContact.Count;
1710 m_stats[ODEAvatarCollisionsStatName] += m_tempAvatarCollisionsThisFrame; 1710 m_stats[ODEAvatarContactsStatsName] += m_tempAvatarCollisionsThisFrame;
1711 } 1711 }
1712 1712
1713 List<OdePrim> removeprims = null; 1713 List<OdePrim> removeprims = null;
@@ -1743,7 +1743,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1743 } 1743 }
1744 1744
1745 if (CollectStats) 1745 if (CollectStats)
1746 m_stats[ODEPrimCollisionsStatName] += _perloopContact.Count - m_tempAvatarCollisionsThisFrame; 1746 m_stats[ODEPrimContactsStatName] += _perloopContact.Count - m_tempAvatarCollisionsThisFrame;
1747 1747
1748 if (removeprims != null) 1748 if (removeprims != null)
1749 { 1749 {
@@ -4089,8 +4089,8 @@ namespace OpenSim.Region.Physics.OdePlugin
4089 private void InitializeExtraStats() 4089 private void InitializeExtraStats()
4090 { 4090 {
4091 m_stats[ODENativeCollisionFrameMsStatName] = 0; 4091 m_stats[ODENativeCollisionFrameMsStatName] = 0;
4092 m_stats[ODEAvatarCollisionsStatName] = 0; 4092 m_stats[ODEAvatarContactsStatsName] = 0;
4093 m_stats[ODEPrimCollisionsStatName] = 0; 4093 m_stats[ODEPrimContactsStatName] = 0;
4094 } 4094 }
4095 } 4095 }
4096} \ No newline at end of file 4096} \ No newline at end of file