aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2011-10-11 23:21:36 +0100
committerMelanie2011-10-11 23:21:36 +0100
commit1b3ea64fe9dbc499696feed70237dffc215ce01b (patch)
tree71f1dff109f07dcace1e43c55ff7ae7ba0ced80d /OpenSim/Region/Framework
parentMerge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmerge (diff)
parentRemove vestigal RegionStatus.SlaveScene. (diff)
downloadopensim-SC-1b3ea64fe9dbc499696feed70237dffc215ce01b.zip
opensim-SC-1b3ea64fe9dbc499696feed70237dffc215ce01b.tar.gz
opensim-SC-1b3ea64fe9dbc499696feed70237dffc215ce01b.tar.bz2
opensim-SC-1b3ea64fe9dbc499696feed70237dffc215ce01b.tar.xz
Merge commit '37ae6451f9ddb2e07402a5e79a9ab58668781104' into bigmerge
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs84
1 files changed, 44 insertions, 40 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 01ab199..9c4757c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1303,28 +1303,12 @@ namespace OpenSim.Region.Framework.Scenes
1303 tempOnRezMS = Util.EnvironmentTickCountSubtract(tmpTempOnRezMS); 1303 tempOnRezMS = Util.EnvironmentTickCountSubtract(tmpTempOnRezMS);
1304 } 1304 }
1305 1305
1306 if (RegionStatus != RegionStatus.SlaveScene) 1306 if (Frame % m_update_events == 0)
1307 { 1307 {
1308 if (Frame % m_update_events == 0) 1308 int evMS = Util.EnvironmentTickCount();
1309 { 1309 UpdateEvents();
1310 int evMS = Util.EnvironmentTickCount(); 1310 eventMS = Util.EnvironmentTickCountSubtract(evMS); ;
1311 UpdateEvents(); 1311 }
1312 eventMS = Util.EnvironmentTickCountSubtract(evMS); ;
1313 }
1314
1315 if (Frame % m_update_backup == 0)
1316 {
1317 int backMS = Util.EnvironmentTickCount();
1318 UpdateStorageBackup();
1319 backupMS = Util.EnvironmentTickCountSubtract(backMS);
1320 }
1321
1322 if (Frame % m_update_terrain == 0)
1323 {
1324 int terMS = Util.EnvironmentTickCount();
1325 UpdateTerrain();
1326 terrainMS = Util.EnvironmentTickCountSubtract(terMS);
1327 }
1328 1312
1329 // if (Frame % m_update_land == 0) 1313 // if (Frame % m_update_land == 0)
1330 // { 1314 // {
@@ -1333,25 +1317,45 @@ namespace OpenSim.Region.Framework.Scenes
1333 // landMS = Util.EnvironmentTickCountSubtract(ldMS); 1317 // landMS = Util.EnvironmentTickCountSubtract(ldMS);
1334 // } 1318 // }
1335 1319
1336 frameMS = Util.EnvironmentTickCountSubtract(tmpFrameMS); 1320 if (Frame % m_update_backup == 0)
1337 otherMS = tempOnRezMS + eventMS + backupMS + terrainMS + landMS; 1321 {
1338 lastCompletedFrame = Util.EnvironmentTickCount(); 1322 int backMS = Util.EnvironmentTickCount();
1339 1323 UpdateStorageBackup();
1340 // if (Frame%m_update_avatars == 0) 1324 backupMS = Util.EnvironmentTickCountSubtract(backMS);
1341 // UpdateInWorldTime(); 1325 }
1342 StatsReporter.AddPhysicsFPS(physicsFPS); 1326
1343 StatsReporter.AddTimeDilation(TimeDilation); 1327 if (Frame % m_update_terrain == 0)
1344 StatsReporter.AddFPS(1); 1328 {
1345 StatsReporter.SetRootAgents(m_sceneGraph.GetRootAgentCount()); 1329 int terMS = Util.EnvironmentTickCount();
1346 StatsReporter.SetChildAgents(m_sceneGraph.GetChildAgentCount()); 1330 UpdateTerrain();
1347 StatsReporter.SetObjects(m_sceneGraph.GetTotalObjectsCount()); 1331 terrainMS = Util.EnvironmentTickCountSubtract(terMS);
1348 StatsReporter.SetActiveObjects(m_sceneGraph.GetActiveObjectsCount()); 1332 }
1349 StatsReporter.addFrameMS(frameMS); 1333
1350 StatsReporter.addPhysicsMS(physicsMS + physicsMS2); 1334 //if (Frame % m_update_land == 0)
1351 StatsReporter.addOtherMS(otherMS); 1335 //{
1352 StatsReporter.SetActiveScripts(m_sceneGraph.GetActiveScriptsCount()); 1336 // int ldMS = Util.EnvironmentTickCount();
1353 StatsReporter.addScriptLines(m_sceneGraph.GetScriptLPS()); 1337 // UpdateLand();
1354 } 1338 // landMS = Util.EnvironmentTickCountSubtract(ldMS);
1339 //}
1340
1341 frameMS = Util.EnvironmentTickCountSubtract(tmpFrameMS);
1342 otherMS = tempOnRezMS + eventMS + backupMS + terrainMS + landMS;
1343 lastCompletedFrame = Util.EnvironmentTickCount();
1344
1345 // if (Frame%m_update_avatars == 0)
1346 // UpdateInWorldTime();
1347 StatsReporter.AddPhysicsFPS(physicsFPS);
1348 StatsReporter.AddTimeDilation(TimeDilation);
1349 StatsReporter.AddFPS(1);
1350 StatsReporter.SetRootAgents(m_sceneGraph.GetRootAgentCount());
1351 StatsReporter.SetChildAgents(m_sceneGraph.GetChildAgentCount());
1352 StatsReporter.SetObjects(m_sceneGraph.GetTotalObjectsCount());
1353 StatsReporter.SetActiveObjects(m_sceneGraph.GetActiveObjectsCount());
1354 StatsReporter.addFrameMS(frameMS);
1355 StatsReporter.addPhysicsMS(physicsMS + physicsMS2);
1356 StatsReporter.addOtherMS(otherMS);
1357 StatsReporter.SetActiveScripts(m_sceneGraph.GetActiveScriptsCount());
1358 StatsReporter.addScriptLines(m_sceneGraph.GetScriptLPS());
1355 1359
1356 if (LoginsDisabled && Frame == 20) 1360 if (LoginsDisabled && Frame == 20)
1357 { 1361 {