OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactor: Put the frame update period when temporary objects are cleaned up in a field, like all the other update periods

0.7.2-post-fixes
Justin Clark-Casey (justincc) 2011-10-13 22:28:42 +01:00
parent 4d93ab06c9
commit 4bce90d0ab
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -175,7 +175,8 @@ namespace OpenSim.Region.Framework.Scenes
private int m_update_physics = 1; private int m_update_physics = 1;
private int m_update_entitymovement = 1; private int m_update_entitymovement = 1;
private int m_update_objects = 1; // Update objects which have scheduled themselves for updates private int m_update_objects = 1;
private int m_update_temp_cleaning = 1000;
private int m_update_presences = 1; // Update scene presence movements private int m_update_presences = 1; // Update scene presence movements
private int m_update_events = 1; private int m_update_events = 1;
private int m_update_backup = 200; private int m_update_backup = 200;
@ -1189,9 +1190,8 @@ namespace OpenSim.Region.Framework.Scenes
int tmpFrameMS = maintc; int tmpFrameMS = maintc;
agentMS = tempOnRezMS = eventMS = backupMS = terrainMS = landMS = 0; agentMS = tempOnRezMS = eventMS = backupMS = terrainMS = landMS = 0;
// TODO: ADD AGENT TIME HERE
// Increment the frame counter
++Frame; ++Frame;
try try
{ {
int tmpAgentMS = Util.EnvironmentTickCount(); int tmpAgentMS = Util.EnvironmentTickCount();
@ -1250,7 +1250,7 @@ namespace OpenSim.Region.Framework.Scenes
physicsMS = Util.EnvironmentTickCountSubtract(tmpPhysicsMS); physicsMS = Util.EnvironmentTickCountSubtract(tmpPhysicsMS);
// Delete temp-on-rez stuff // Delete temp-on-rez stuff
if (Frame % 1000 == 0 && !m_cleaningTemps) if (Frame % m_update_temp_cleaning == 0 && !m_cleaningTemps)
{ {
int tmpTempOnRezMS = Util.EnvironmentTickCount(); int tmpTempOnRezMS = Util.EnvironmentTickCount();
m_cleaningTemps = true; m_cleaningTemps = true;