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

ubOde bug fix

LSLKeyTest
UbitUmarov 2016-07-25 06:07:06 +01:00
parent c3b298f85e
commit f661fdf2aa
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
View File

@ -546,6 +546,9 @@ namespace OpenSim.Region.PhysicsModule.ubOde
{ {
get get
{ {
if (_parent != null)
return ((OdePrim)_parent).Velocity;
if (_zeroFlag) if (_zeroFlag)
return Vector3.Zero; return Vector3.Zero;
return _velocity; return _velocity;
@ -560,7 +563,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde
{ {
m_log.WarnFormat("[PHYSICS]: Got NaN Velocity in Object {0}", Name); m_log.WarnFormat("[PHYSICS]: Got NaN Velocity in Object {0}", Name);
} }
} }
} }

2
OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
View File

@ -995,7 +995,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
p1.CollidingObj = true; p1.CollidingObj = true;
p2.CollidingObj = true; p2.CollidingObj = true;
} }
else if (p2.Velocity.LengthSquared() > 0.0f) else if (p1.Velocity.LengthSquared() > 0.0f)
p1.CollidingObj = true; p1.CollidingObj = true;
} }
else else