From f374b63ac8a2f75b59b2c0442ab8000f76466f70 Mon Sep 17 00:00:00 2001
From: Dan Lake
Date: Thu, 10 May 2012 14:42:46 -0700
Subject: Add even for terrain tainting and synchronize terrain module with
 physics scene before physics simulation step rather than after

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 4d0aa6f..3d2213a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1353,6 +1353,14 @@ namespace OpenSim.Region.Framework.Scenes
 
                 try
                 {
+                    // Apply taints in terrain module to terrain in physics scene
+                    if (Frame % m_update_terrain == 0)
+                    {
+                        terMS = Util.EnvironmentTickCount();
+                        UpdateTerrain();
+                        terrainMS = Util.EnvironmentTickCountSubtract(terMS);
+                    }
+
                     tmpPhysicsMS2 = Util.EnvironmentTickCount();
                     if ((Frame % m_update_physics == 0) && m_physics_enabled)
                         m_sceneGraph.UpdatePreparePhysics();
@@ -1417,13 +1425,6 @@ namespace OpenSim.Region.Framework.Scenes
                         backupMS = Util.EnvironmentTickCountSubtract(backMS);
                     }
     
-                    if (Frame % m_update_terrain == 0)
-                    {
-                        terMS = Util.EnvironmentTickCount();
-                        UpdateTerrain();
-                        terrainMS = Util.EnvironmentTickCountSubtract(terMS);
-                    }
-    
                     //if (Frame % m_update_land == 0)
                     //{
                     //    int ldMS = Util.EnvironmentTickCount();
-- 
cgit v1.1