aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs5
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