Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

2012-10-28 10:58:58 +01:00 · 2012-10-28 10:58:58 +01:00 · 3aff65e9a6
parent 3ac8461d3f e297e90bda
commit 3aff65e9a6
1 changed files with 1 additions and 1 deletions
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@ -1322,7 +1322,7 @@ namespace OpenSim.Region.Framework.Scenes
            }
 //            m_lastUpdate = Util.EnvironmentTickCount();

-            m_sceneGraph.PreparePhysicsSimulation();
+//            m_sceneGraph.PreparePhysicsSimulation();


            m_heartbeatThread