aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDan Lake2012-11-02 03:07:53 -0700
committerDan Lake2012-11-02 03:09:04 -0700
commit2e106cd5de63caf3d4eaeda8ac9a6ab0007a6b14 (patch)
tree2840376f3fcefb9266d278352651359e2bacbb65
parentAdd [AssetService] AllowRemoteDeleteAllTypes (default false). (diff)
downloadopensim-SC_OLD-2e106cd5de63caf3d4eaeda8ac9a6ab0007a6b14.zip
opensim-SC_OLD-2e106cd5de63caf3d4eaeda8ac9a6ab0007a6b14.tar.gz
opensim-SC_OLD-2e106cd5de63caf3d4eaeda8ac9a6ab0007a6b14.tar.bz2
opensim-SC_OLD-2e106cd5de63caf3d4eaeda8ac9a6ab0007a6b14.tar.xz
Change to earlier commit for TargetVelocity to support distributed physics.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 5f2a6b1..96bca3e 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -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.TargetVelocity; 526 m_velocity = PhysicsActor.Velocity;
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!",
@@ -538,7 +538,7 @@ namespace OpenSim.Region.Framework.Scenes
538 { 538 {
539 try 539 try
540 { 540 {
541 PhysicsActor.Velocity = value; 541 PhysicsActor.TargetVelocity = value;
542 } 542 }
543 catch (Exception e) 543 catch (Exception e)
544 { 544 {