aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
diff options
context:
space:
mode:
authorUbitUmarov2016-07-25 06:07:06 +0100
committerUbitUmarov2016-07-25 06:07:06 +0100
commitf661fdf2aade7b92c82bba9a5e216c796681c2fd (patch)
treeb53fab876a11e62da698dd511e8ae8acae3ce03c /OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
parentmissing file (diff)
downloadopensim-SC-f661fdf2aade7b92c82bba9a5e216c796681c2fd.zip
opensim-SC-f661fdf2aade7b92c82bba9a5e216c796681c2fd.tar.gz
opensim-SC-f661fdf2aade7b92c82bba9a5e216c796681c2fd.tar.bz2
opensim-SC-f661fdf2aade7b92c82bba9a5e216c796681c2fd.tar.xz
ubOde bug fix
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
index 6ed42d9..437440c 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
@@ -546,6 +546,9 @@ namespace OpenSim.Region.PhysicsModule.ubOde
546 { 546 {
547 get 547 get
548 { 548 {
549 if (_parent != null)
550 return ((OdePrim)_parent).Velocity;
551
549 if (_zeroFlag) 552 if (_zeroFlag)
550 return Vector3.Zero; 553 return Vector3.Zero;
551 return _velocity; 554 return _velocity;
@@ -560,7 +563,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde
560 { 563 {
561 m_log.WarnFormat("[PHYSICS]: Got NaN Velocity in Object {0}", Name); 564 m_log.WarnFormat("[PHYSICS]: Got NaN Velocity in Object {0}", Name);
562 } 565 }
563
564 } 566 }
565 } 567 }
566 568