aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
diff options
context:
space:
mode:
authorUbitUmarov2016-07-25 07:06:36 +0100
committerUbitUmarov2016-07-25 07:06:36 +0100
commitaa9503ab8616f11f9c579631213663df8e20d143 (patch)
treed25fb4b1ebc0fbfa51acf6ddd1bc31987954ec97 /OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
parentubOde bug fix (diff)
downloadopensim-SC-aa9503ab8616f11f9c579631213663df8e20d143.zip
opensim-SC-aa9503ab8616f11f9c579631213663df8e20d143.tar.gz
opensim-SC-aa9503ab8616f11f9c579631213663df8e20d143.tar.bz2
opensim-SC-aa9503ab8616f11f9c579631213663df8e20d143.tar.xz
revert bad last changes and fix the issue another way
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs11
1 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
index 437440c..21efa97 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
@@ -542,13 +542,20 @@ namespace OpenSim.Region.PhysicsModule.ubOde
542 } 542 }
543 } 543 }
544 544
545 public override Vector3 Velocity 545 public Vector3 rootVelocity
546 { 546 {
547 get 547 get
548 { 548 {
549 if (_parent != null) 549 if(_parent != null)
550 return ((OdePrim)_parent).Velocity; 550 return ((OdePrim)_parent).Velocity;
551 return Velocity;
552 }
553 }
551 554
555 public override Vector3 Velocity
556 {
557 get
558 {
552 if (_zeroFlag) 559 if (_zeroFlag)
553 return Vector3.Zero; 560 return Vector3.Zero;
554 return _velocity; 561 return _velocity;