diff options
author | UbitUmarov | 2012-04-09 20:58:40 +0100 |
---|---|---|
committer | UbitUmarov | 2012-04-09 20:58:40 +0100 |
commit | 39079a62c038986b20ccc3cf89a2e169f6e6135f (patch) | |
tree | 465e2c3a2dae0a9351f4f673c78df6175ec05555 /OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | |
parent | llGetMass and llGetObjectMass (and push estimation) always use object mass a... (diff) | |
download | opensim-SC_OLD-39079a62c038986b20ccc3cf89a2e169f6e6135f.zip opensim-SC_OLD-39079a62c038986b20ccc3cf89a2e169f6e6135f.tar.gz opensim-SC_OLD-39079a62c038986b20ccc3cf89a2e169f6e6135f.tar.bz2 opensim-SC_OLD-39079a62c038986b20ccc3cf89a2e169f6e6135f.tar.xz |
chODE and ubitODE always return prim mass (they where returning object mass on physical prims) so SOG can do the total add. (ubitODE as more code to use a simpler terrain geom on a modified ode lib but should do autodetect and work with normal lib).
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs')
-rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs index c4dc793..f739183 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | |||
@@ -395,7 +395,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
395 | 395 | ||
396 | public override float Mass | 396 | public override float Mass |
397 | { | 397 | { |
398 | get { return _mass; } | 398 | get { return primMass; } |
399 | } | 399 | } |
400 | 400 | ||
401 | public override Vector3 Force | 401 | public override Vector3 Force |