diff options
| author | Justin Clark-Casey (justincc) | 2012-06-29 01:02:35 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-06-29 01:02:35 +0100 |
| commit | 0229e90dcc579cee8fe3321a78f6d75b5d70486e (patch) | |
| tree | 4f1983dbda29290e53cd1910954135cd058641c5 /OpenSim/Region/Physics | |
| parent | refactor: rename _collisionEventPrim to m_collisionEventActors and _collision... (diff) | |
| download | opensim-SC-0229e90dcc579cee8fe3321a78f6d75b5d70486e.zip opensim-SC-0229e90dcc579cee8fe3321a78f6d75b5d70486e.tar.gz opensim-SC-0229e90dcc579cee8fe3321a78f6d75b5d70486e.tar.bz2 opensim-SC-0229e90dcc579cee8fe3321a78f6d75b5d70486e.tar.xz | |
Move update of the final optional ODE total frame stat inside the OdeLock rather than outside to avoid a very occasional race condition with the stat collection thread
Diffstat (limited to 'OpenSim/Region/Physics')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index 79de99e..32e81e2 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||
| @@ -3227,10 +3227,10 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 3227 | } | 3227 | } |
| 3228 | 3228 | ||
| 3229 | tickCountFrameRun = Util.EnvironmentTickCount(); | 3229 | tickCountFrameRun = Util.EnvironmentTickCount(); |
| 3230 | } | ||
| 3231 | 3230 | ||
| 3232 | if (CollectStats) | 3231 | if (CollectStats) |
| 3233 | m_stats[ODETotalFrameMsStatName] += Util.EnvironmentTickCountSubtract(startFrameTick); | 3232 | m_stats[ODETotalFrameMsStatName] += Util.EnvironmentTickCountSubtract(startFrameTick); |
| 3233 | } | ||
| 3234 | 3234 | ||
| 3235 | return fps; | 3235 | return fps; |
| 3236 | } | 3236 | } |