Merge branch 'master' into careminster

This commit is contained in:
Melanie
2012-11-01 15:52:32 +00:00
5 changed files with 13 additions and 5 deletions

View File

@@ -532,7 +532,7 @@ namespace OpenSim.Region.Framework.Scenes
{
if (PhysicsActor != null)
{
m_velocity = PhysicsActor.Velocity;
m_velocity = PhysicsActor.TargetVelocity;
// m_log.DebugFormat(
// "[SCENE PRESENCE]: Set velocity {0} for {1} in {2} via getting Velocity!",