diff options
author | Justin Clark-Casey (justincc) | 2012-03-20 23:31:57 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-03-20 23:31:57 +0000 |
commit | 3701f893d366643529429851cfac462951655683 (patch) | |
tree | c420993a0e10dfec0f46f37c1083380d291ddb35 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | minor: remove some mono compiler warnings (diff) | |
download | opensim-SC-3701f893d366643529429851cfac462951655683.zip opensim-SC-3701f893d366643529429851cfac462951655683.tar.gz opensim-SC-3701f893d366643529429851cfac462951655683.tar.bz2 opensim-SC-3701f893d366643529429851cfac462951655683.tar.xz |
remove unnecessary tmpFrameMS, use maintc instead for frame time calculation
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index fe59e4d..1bea14f 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1201,7 +1201,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1201 | endFrame = Frame + frames; | 1201 | endFrame = Frame + frames; |
1202 | 1202 | ||
1203 | float physicsFPS = 0f; | 1203 | float physicsFPS = 0f; |
1204 | int tmpFrameMS, tmpPhysicsMS, tmpPhysicsMS2, tmpAgentMS, tmpTempOnRezMS, evMS, backMS, terMS; | 1204 | int tmpPhysicsMS, tmpPhysicsMS2, tmpAgentMS, tmpTempOnRezMS, evMS, backMS, terMS; |
1205 | int maintc; | 1205 | int maintc; |
1206 | List<Vector3> coarseLocations; | 1206 | List<Vector3> coarseLocations; |
1207 | List<UUID> avatarUUIDs; | 1207 | List<UUID> avatarUUIDs; |
@@ -1213,7 +1213,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1213 | 1213 | ||
1214 | // m_log.DebugFormat("[SCENE]: Processing frame {0} in {1}", Frame, RegionInfo.RegionName); | 1214 | // m_log.DebugFormat("[SCENE]: Processing frame {0} in {1}", Frame, RegionInfo.RegionName); |
1215 | 1215 | ||
1216 | tmpFrameMS = maintc; | ||
1217 | agentMS = tempOnRezMS = eventMS = backupMS = terrainMS = landMS = 0; | 1216 | agentMS = tempOnRezMS = eventMS = backupMS = terrainMS = landMS = 0; |
1218 | 1217 | ||
1219 | try | 1218 | try |
@@ -1307,7 +1306,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1307 | // landMS = Util.EnvironmentTickCountSubtract(ldMS); | 1306 | // landMS = Util.EnvironmentTickCountSubtract(ldMS); |
1308 | //} | 1307 | //} |
1309 | 1308 | ||
1310 | frameMS = Util.EnvironmentTickCountSubtract(tmpFrameMS); | 1309 | frameMS = Util.EnvironmentTickCountSubtract(maintc); |
1311 | otherMS = tempOnRezMS + eventMS + backupMS + terrainMS + landMS; | 1310 | otherMS = tempOnRezMS + eventMS + backupMS + terrainMS + landMS; |
1312 | lastCompletedFrame = Util.EnvironmentTickCount(); | 1311 | lastCompletedFrame = Util.EnvironmentTickCount(); |
1313 | 1312 | ||