aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsActor.cs2
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs4
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index 9338130..dcb2c91 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -274,7 +274,7 @@ namespace OpenSim.Region.Physics.Manager
274 public virtual float Density { get; set; } 274 public virtual float Density { get; set; }
275 public virtual float GravModifier { get; set; } 275 public virtual float GravModifier { get; set; }
276 public virtual float Friction { get; set; } 276 public virtual float Friction { get; set; }
277 public virtual float Bounce { get; set; } 277 public virtual float Restitution { get; set; }
278 278
279 /// <summary> 279 /// <summary>
280 /// Position of this actor. 280 /// Position of this actor.
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
index f7e4c1c..bea34d4 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
@@ -1014,8 +1014,8 @@ namespace OpenSim.Region.Physics.OdePlugin
1014 offset.Y += contact.pos.Y; 1014 offset.Y += contact.pos.Y;
1015 offset.Z += contact.pos.Z; 1015 offset.Z += contact.pos.Z;
1016 1016
1017 _position = offset; 1017 //_position = offset;
1018 return false; 1018 //return false;
1019 } 1019 }
1020 1020
1021 offset.X = contact.pos.X - _position.X; 1021 offset.X = contact.pos.X - _position.X;