diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 6d2ae5a..ef97dfc 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1319,6 +1319,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1319 | if (m_frame % m_update_presences == 0) | 1319 | if (m_frame % m_update_presences == 0) |
1320 | m_sceneGraph.UpdatePresences(); | 1320 | m_sceneGraph.UpdatePresences(); |
1321 | 1321 | ||
1322 | // Coarse locations relate to positions of green dots on the mini-map (on a SecondLife client) | ||
1322 | if (m_frame % m_update_coarse_locations == 0) | 1323 | if (m_frame % m_update_coarse_locations == 0) |
1323 | { | 1324 | { |
1324 | List<Vector3> coarseLocations; | 1325 | List<Vector3> coarseLocations; |
@@ -1336,9 +1337,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
1336 | m_sceneGraph.UpdatePreparePhysics(); | 1337 | m_sceneGraph.UpdatePreparePhysics(); |
1337 | physicsMS2 = Util.EnvironmentTickCountSubtract(tmpPhysicsMS2); | 1338 | physicsMS2 = Util.EnvironmentTickCountSubtract(tmpPhysicsMS2); |
1338 | 1339 | ||
1340 | // Apply any pending avatar force input to the avatar's velocity | ||
1339 | if (m_frame % m_update_entitymovement == 0) | 1341 | if (m_frame % m_update_entitymovement == 0) |
1340 | m_sceneGraph.UpdateScenePresenceMovement(); | 1342 | m_sceneGraph.UpdateScenePresenceMovement(); |
1341 | 1343 | ||
1344 | // Perform the main physics update. This will do the actual work of moving objects and avatars according to their | ||
1345 | // velocity | ||
1342 | int tmpPhysicsMS = Util.EnvironmentTickCount(); | 1346 | int tmpPhysicsMS = Util.EnvironmentTickCount(); |
1343 | if (m_frame % m_update_physics == 0) | 1347 | if (m_frame % m_update_physics == 0) |
1344 | { | 1348 | { |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 51a0f2a..a77f38c 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1522,6 +1522,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1522 | } | 1522 | } |
1523 | } | 1523 | } |
1524 | 1524 | ||
1525 | // If the agent update does move the avatar, then calculate the force ready for the velocity update, | ||
1526 | // which occurs later in the main scene loop | ||
1525 | if (update_movementflag || (update_rotation && DCFlagKeyPressed)) | 1527 | if (update_movementflag || (update_rotation && DCFlagKeyPressed)) |
1526 | { | 1528 | { |
1527 | // m_log.DebugFormat("{0} {1}", update_movementflag, (update_rotation && DCFlagKeyPressed)); | 1529 | // m_log.DebugFormat("{0} {1}", update_movementflag, (update_rotation && DCFlagKeyPressed)); |