aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Manager/PhysicsActor.cs
diff options
context:
space:
mode:
authorMelanie2012-05-27 19:35:36 +0100
committerMelanie2012-05-27 19:35:36 +0100
commit78e657fd8d911deb0dc1a0eb20a7f2bb2fea1a63 (patch)
treef89d40cb907cd6d8a0df0432c089633c1eb50b8b /OpenSim/Region/Physics/Manager/PhysicsActor.cs
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'ubitwork' into avination (diff)
downloadopensim-SC_OLD-78e657fd8d911deb0dc1a0eb20a7f2bb2fea1a63.zip
opensim-SC_OLD-78e657fd8d911deb0dc1a0eb20a7f2bb2fea1a63.tar.gz
opensim-SC_OLD-78e657fd8d911deb0dc1a0eb20a7f2bb2fea1a63.tar.bz2
opensim-SC_OLD-78e657fd8d911deb0dc1a0eb20a7f2bb2fea1a63.tar.xz
Merge branch 'avination' into careminster
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsActor.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index b66d7f1..fb90887 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -59,12 +59,14 @@ namespace OpenSim.Region.Physics.Manager
59 public Vector3 Position; 59 public Vector3 Position;
60 public Vector3 SurfaceNormal; 60 public Vector3 SurfaceNormal;
61 public float PenetrationDepth; 61 public float PenetrationDepth;
62 public float RelativeSpeed;
62 63
63 public ContactPoint(Vector3 position, Vector3 surfaceNormal, float penetrationDepth) 64 public ContactPoint(Vector3 position, Vector3 surfaceNormal, float penetrationDepth)
64 { 65 {
65 Position = position; 66 Position = position;
66 SurfaceNormal = surfaceNormal; 67 SurfaceNormal = surfaceNormal;
67 PenetrationDepth = penetrationDepth; 68 PenetrationDepth = penetrationDepth;
69 RelativeSpeed = 0f; // for now let this one be set explicity
68 } 70 }
69 } 71 }
70 72