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

avinationmerge
ubit 2012-10-28 10:58:58 +01:00
commit 3aff65e9a6
1 changed files with 1 additions and 1 deletions

View File

@ -1322,7 +1322,7 @@ namespace OpenSim.Region.Framework.Scenes
} }
// m_lastUpdate = Util.EnvironmentTickCount(); // m_lastUpdate = Util.EnvironmentTickCount();
m_sceneGraph.PreparePhysicsSimulation(); // m_sceneGraph.PreparePhysicsSimulation();
m_heartbeatThread m_heartbeatThread