From 4bce90d0ab1140f5286f115d2970226ee5abc793 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Thu, 13 Oct 2011 22:28:42 +0100 Subject: [PATCH] refactor: Put the frame update period when temporary objects are cleaned up in a field, like all the other update periods --- OpenSim/Region/Framework/Scenes/Scene.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 2d21e82141..bcef7e596f 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -175,7 +175,8 @@ namespace OpenSim.Region.Framework.Scenes private int m_update_physics = 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_events = 1; private int m_update_backup = 200; @@ -1189,9 +1190,8 @@ namespace OpenSim.Region.Framework.Scenes int tmpFrameMS = maintc; agentMS = tempOnRezMS = eventMS = backupMS = terrainMS = landMS = 0; - // TODO: ADD AGENT TIME HERE - // Increment the frame counter ++Frame; + try { int tmpAgentMS = Util.EnvironmentTickCount(); @@ -1250,7 +1250,7 @@ namespace OpenSim.Region.Framework.Scenes physicsMS = Util.EnvironmentTickCountSubtract(tmpPhysicsMS); // Delete temp-on-rez stuff - if (Frame % 1000 == 0 && !m_cleaningTemps) + if (Frame % m_update_temp_cleaning == 0 && !m_cleaningTemps) { int tmpTempOnRezMS = Util.EnvironmentTickCount(); m_cleaningTemps = true;