diff options
author | Justin Clark-Casey (justincc) | 2012-06-01 02:35:11 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-06-01 02:35:11 +0100 |
commit | d1b5f8d9d76e3c7c4c23f485dd070e3775e8e85f (patch) | |
tree | 17d676336cc0d46e0c634f89d5b37996fb39be36 /OpenSim/Region | |
parent | Add optional stat that records milliseconds spent notifying collision listene... (diff) | |
download | opensim-SC-d1b5f8d9d76e3c7c4c23f485dd070e3775e8e85f.zip opensim-SC-d1b5f8d9d76e3c7c4c23f485dd070e3775e8e85f.tar.gz opensim-SC-d1b5f8d9d76e3c7c4c23f485dd070e3775e8e85f.tar.bz2 opensim-SC-d1b5f8d9d76e3c7c4c23f485dd070e3775e8e85f.tar.xz |
Remove recent optional native collision frame milliseconds stat
Unnecessary since this has now been broken down into space collisions and geom collisions
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 14 |
1 files changed, 1 insertions, 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 | |||
156 | public const string ODENativeStepFrameMsStatName = "ODENativeStepFrameMS"; | 156 | public const string ODENativeStepFrameMsStatName = "ODENativeStepFrameMS"; |
157 | 157 | ||
158 | /// <summary> | 158 | /// <summary> |
159 | /// Stat name for the number of milliseconds that ODE spends in native collision code. | ||
160 | /// </summary> | ||
161 | public const string ODENativeCollisionFrameMsStatName = "ODENativeCollisionFrameMS"; | ||
162 | |||
163 | /// <summary> | ||
164 | /// Stat name for the number of milliseconds that ODE spends in native space collision code. | 159 | /// Stat name for the number of milliseconds that ODE spends in native space collision code. |
165 | /// </summary> | 160 | /// </summary> |
166 | public const string ODENativeSpaceCollisionFrameMsStatName = "ODENativeSpaceCollisionFrameMS"; | 161 | public const string ODENativeSpaceCollisionFrameMsStatName = "ODENativeSpaceCollisionFrameMS"; |
@@ -3035,7 +3030,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
3035 | { | 3030 | { |
3036 | m_stats[ODECollisionNotificationFrameMsStatName] | 3031 | m_stats[ODECollisionNotificationFrameMsStatName] |
3037 | += Util.EnvironmentTickCountSubtract(tempTick); | 3032 | += Util.EnvironmentTickCountSubtract(tempTick); |
3038 | 3033 | ||
3039 | tempTick = Util.EnvironmentTickCount(); | 3034 | tempTick = Util.EnvironmentTickCount(); |
3040 | } | 3035 | } |
3041 | 3036 | ||
@@ -4149,10 +4144,6 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
4149 | { | 4144 | { |
4150 | returnStats = new Dictionary<string, float>(m_stats); | 4145 | returnStats = new Dictionary<string, float>(m_stats); |
4151 | 4146 | ||
4152 | returnStats[ODENativeCollisionFrameMsStatName] | ||
4153 | = returnStats[ODENativeSpaceCollisionFrameMsStatName] | ||
4154 | + returnStats[ODENativeGeomCollisionFrameMsStatName]; | ||
4155 | |||
4156 | InitializeExtraStats(); | 4147 | InitializeExtraStats(); |
4157 | } | 4148 | } |
4158 | 4149 | ||
@@ -4161,9 +4152,6 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
4161 | 4152 | ||
4162 | private void InitializeExtraStats() | 4153 | private void InitializeExtraStats() |
4163 | { | 4154 | { |
4164 | // No need to zero since this is calculated by addition | ||
4165 | // m_stats[ODENativeCollisionFrameMsStatName] = 0; | ||
4166 | |||
4167 | m_stats[ODETotalFrameMsStatName] = 0; | 4155 | m_stats[ODETotalFrameMsStatName] = 0; |
4168 | m_stats[ODENativeStepFrameMsStatName] = 0; | 4156 | m_stats[ODENativeStepFrameMsStatName] = 0; |
4169 | m_stats[ODENativeSpaceCollisionFrameMsStatName] = 0; | 4157 | m_stats[ODENativeSpaceCollisionFrameMsStatName] = 0; |