diff options
| author | Justin Clark-Casey (justincc) | 2012-11-01 03:34:11 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-11-01 03:34:11 +0000 |
| commit | a7d9f5598fc3b5bfc4b1c7a218f3a98c95f69579 (patch) | |
| tree | 75dfe9d38d8926e96d877945fdd84377a2cb2de8 /OpenSim/Region/Framework | |
| parent | Replace the 64 bit macosx version of libopenjpeg-dotnet.dylib with a 32-bit v... (diff) | |
| parent | Add TargetVelocity to PhysicsActor interface to support distributed physics. ... (diff) | |
| download | opensim-SC-a7d9f5598fc3b5bfc4b1c7a218f3a98c95f69579.zip opensim-SC-a7d9f5598fc3b5bfc4b1c7a218f3a98c95f69579.tar.gz opensim-SC-a7d9f5598fc3b5bfc4b1c7a218f3a98c95f69579.tar.bz2 opensim-SC-a7d9f5598fc3b5bfc4b1c7a218f3a98c95f69579.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 71e322d..5f2a6b1 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -523,7 +523,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 523 | { | 523 | { |
| 524 | if (PhysicsActor != null) | 524 | if (PhysicsActor != null) |
| 525 | { | 525 | { |
| 526 | m_velocity = PhysicsActor.Velocity; | 526 | m_velocity = PhysicsActor.TargetVelocity; |
| 527 | 527 | ||
| 528 | // m_log.DebugFormat( | 528 | // m_log.DebugFormat( |
| 529 | // "[SCENE PRESENCE]: Set velocity {0} for {1} in {2} via getting Velocity!", | 529 | // "[SCENE PRESENCE]: Set velocity {0} for {1} in {2} via getting Velocity!", |