diff options
| author | ubit | 2012-10-28 10:58:58 +0100 |
|---|---|---|
| committer | ubit | 2012-10-28 10:58:58 +0100 |
| commit | 3aff65e9a673471a449ac70046275e264bfc6ede (patch) | |
| tree | 4f6418c432bab04e5f6323fdad98cbf25c7e8a9a /OpenSim/Region/Framework/Scenes | |
| parent | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
| parent | remove pre physics build testing (diff) | |
| download | opensim-SC-3aff65e9a673471a449ac70046275e264bfc6ede.zip opensim-SC-3aff65e9a673471a449ac70046275e264bfc6ede.tar.gz opensim-SC-3aff65e9a673471a449ac70046275e264bfc6ede.tar.bz2 opensim-SC-3aff65e9a673471a449ac70046275e264bfc6ede.tar.xz | |
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 32a7935..ccb4aad 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -1322,7 +1322,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1322 | } | 1322 | } |
| 1323 | // m_lastUpdate = Util.EnvironmentTickCount(); | 1323 | // m_lastUpdate = Util.EnvironmentTickCount(); |
| 1324 | 1324 | ||
| 1325 | m_sceneGraph.PreparePhysicsSimulation(); | 1325 | // m_sceneGraph.PreparePhysicsSimulation(); |
| 1326 | 1326 | ||
| 1327 | 1327 | ||
| 1328 | m_heartbeatThread | 1328 | m_heartbeatThread |