aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorMelanie2012-11-01 15:52:32 +0000
committerMelanie2012-11-01 15:52:32 +0000
commite7a6328ea40bbbc5dba50ca21ec4e9e2c7283081 (patch)
tree105184438f58ba43388aa285e456dfd5ff87fdcd /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parentMerge branch 'master' into careminster (diff)
parentComment out checks not to overwrite existing IAR/OAR files for now on "save i... (diff)
downloadopensim-SC_OLD-e7a6328ea40bbbc5dba50ca21ec4e9e2c7283081.zip
opensim-SC_OLD-e7a6328ea40bbbc5dba50ca21ec4e9e2c7283081.tar.gz
opensim-SC_OLD-e7a6328ea40bbbc5dba50ca21ec4e9e2c7283081.tar.bz2
opensim-SC_OLD-e7a6328ea40bbbc5dba50ca21ec4e9e2c7283081.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index f9c7935..e2be79a 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -532,7 +532,7 @@ namespace OpenSim.Region.Framework.Scenes
532 { 532 {
533 if (PhysicsActor != null) 533 if (PhysicsActor != null)
534 { 534 {
535 m_velocity = PhysicsActor.Velocity; 535 m_velocity = PhysicsActor.TargetVelocity;
536 536
537// m_log.DebugFormat( 537// m_log.DebugFormat(
538// "[SCENE PRESENCE]: Set velocity {0} for {1} in {2} via getting Velocity!", 538// "[SCENE PRESENCE]: Set velocity {0} for {1} in {2} via getting Velocity!",