diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index ff2c46f..89cde05 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1403,6 +1403,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
1403 | 1403 | ||
1404 | try | 1404 | try |
1405 | { | 1405 | { |
1406 | // Apply taints in terrain module to terrain in physics scene | ||
1407 | if (Frame % m_update_terrain == 0) | ||
1408 | { | ||
1409 | terMS = Util.EnvironmentTickCount(); | ||
1410 | UpdateTerrain(); | ||
1411 | terrainMS = Util.EnvironmentTickCountSubtract(terMS); | ||
1412 | } | ||
1413 | |||
1406 | tmpPhysicsMS2 = Util.EnvironmentTickCount(); | 1414 | tmpPhysicsMS2 = Util.EnvironmentTickCount(); |
1407 | if ((Frame % m_update_physics == 0) && m_physics_enabled) | 1415 | if ((Frame % m_update_physics == 0) && m_physics_enabled) |
1408 | m_sceneGraph.UpdatePreparePhysics(); | 1416 | m_sceneGraph.UpdatePreparePhysics(); |
@@ -1467,13 +1475,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1467 | backupMS = Util.EnvironmentTickCountSubtract(backMS); | 1475 | backupMS = Util.EnvironmentTickCountSubtract(backMS); |
1468 | } | 1476 | } |
1469 | 1477 | ||
1470 | if (Frame % m_update_terrain == 0) | ||
1471 | { | ||
1472 | terMS = Util.EnvironmentTickCount(); | ||
1473 | UpdateTerrain(); | ||
1474 | terrainMS = Util.EnvironmentTickCountSubtract(terMS); | ||
1475 | } | ||
1476 | |||
1477 | //if (Frame % m_update_land == 0) | 1478 | //if (Frame % m_update_land == 0) |
1478 | //{ | 1479 | //{ |
1479 | // int ldMS = Util.EnvironmentTickCount(); | 1480 | // int ldMS = Util.EnvironmentTickCount(); |