diff options
author | Justin Clark-Casey (justincc) | 2011-10-13 22:28:42 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-10-13 22:28:42 +0100 |
commit | 128d8dfd8b355f84a71e2093e942937ca720c5c6 (patch) | |
tree | 96759761c6db040933f7277a6b638e7d538b0c7c /OpenSim/Region | |
parent | refactor: chain the two scene constructors together to eliminate more copypasta (diff) | |
download | opensim-SC_OLD-128d8dfd8b355f84a71e2093e942937ca720c5c6.zip opensim-SC_OLD-128d8dfd8b355f84a71e2093e942937ca720c5c6.tar.gz opensim-SC_OLD-128d8dfd8b355f84a71e2093e942937ca720c5c6.tar.bz2 opensim-SC_OLD-128d8dfd8b355f84a71e2093e942937ca720c5c6.tar.xz |
refactor: Put the frame update period when temporary objects are cleaned up in a field, like all the other update periods
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 6efcd99..225235a 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -175,7 +175,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
175 | 175 | ||
176 | private int m_update_physics = 1; | 176 | private int m_update_physics = 1; |
177 | private int m_update_entitymovement = 1; | 177 | private int m_update_entitymovement = 1; |
178 | private int m_update_objects = 1; // Update objects which have scheduled themselves for updates | 178 | private int m_update_objects = 1; |
179 | private int m_update_temp_cleaning = 1000; | ||
179 | private int m_update_presences = 1; // Update scene presence movements | 180 | private int m_update_presences = 1; // Update scene presence movements |
180 | private int m_update_events = 1; | 181 | private int m_update_events = 1; |
181 | private int m_update_backup = 200; | 182 | private int m_update_backup = 200; |
@@ -1187,9 +1188,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1187 | int tmpFrameMS = maintc; | 1188 | int tmpFrameMS = maintc; |
1188 | agentMS = tempOnRezMS = eventMS = backupMS = terrainMS = landMS = 0; | 1189 | agentMS = tempOnRezMS = eventMS = backupMS = terrainMS = landMS = 0; |
1189 | 1190 | ||
1190 | // TODO: ADD AGENT TIME HERE | ||
1191 | // Increment the frame counter | ||
1192 | ++Frame; | 1191 | ++Frame; |
1192 | |||
1193 | try | 1193 | try |
1194 | { | 1194 | { |
1195 | int tmpAgentMS = Util.EnvironmentTickCount(); | 1195 | int tmpAgentMS = Util.EnvironmentTickCount(); |
@@ -1248,7 +1248,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1248 | physicsMS = Util.EnvironmentTickCountSubtract(tmpPhysicsMS); | 1248 | physicsMS = Util.EnvironmentTickCountSubtract(tmpPhysicsMS); |
1249 | 1249 | ||
1250 | // Delete temp-on-rez stuff | 1250 | // Delete temp-on-rez stuff |
1251 | if (Frame % 1000 == 0 && !m_cleaningTemps) | 1251 | if (Frame % m_update_temp_cleaning == 0 && !m_cleaningTemps) |
1252 | { | 1252 | { |
1253 | int tmpTempOnRezMS = Util.EnvironmentTickCount(); | 1253 | int tmpTempOnRezMS = Util.EnvironmentTickCount(); |
1254 | m_cleaningTemps = true; | 1254 | m_cleaningTemps = true; |