OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

integration
Justin Clark-Casey (justincc) 2012-11-01 03:34:11 +00:00
parent ccb17eab71 ffe4d738fb
commit a7d9f5598f
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

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

6
OpenSim/Region/Physics/Manager/PhysicsActor.cs
View File

@ -257,6 +257,12 @@ namespace OpenSim.Region.Physics.Manager
/// Getting this returns the velocity calculated by physics scene updates, using factors such as target velocity, /// Getting this returns the velocity calculated by physics scene updates, using factors such as target velocity,
/// time to accelerate and collisions. /// time to accelerate and collisions.
/// </remarks> /// </remarks>
public virtual Vector3 TargetVelocity
{
get { return Velocity; }
set { Velocity = value; }
}
public abstract Vector3 Velocity { get; set; } public abstract Vector3 Velocity { get; set; }
public abstract Vector3 Torque { get; set; } public abstract Vector3 Torque { get; set; }