diff options
| author | Melanie | 2012-05-21 07:32:27 +0200 |
|---|---|---|
| committer | Melanie | 2012-05-21 07:32:27 +0200 |
| commit | 7305d2e0ef843de24477e8f41af3091c880d811a (patch) | |
| tree | a47dcb2bb8202146ced7ae2ae609c7bbcc8aeebb /OpenSim/Region/Physics/Manager | |
| parent | Fix setting positions of attachments. The recent security fix regarding (diff) | |
| parent | missing update script events call (diff) | |
| download | opensim-SC_OLD-7305d2e0ef843de24477e8f41af3091c880d811a.zip opensim-SC_OLD-7305d2e0ef843de24477e8f41af3091c880d811a.tar.gz opensim-SC_OLD-7305d2e0ef843de24477e8f41af3091c880d811a.tar.bz2 opensim-SC_OLD-7305d2e0ef843de24477e8f41af3091c880d811a.tar.xz | |
Merge branch 'ubitwork' into avination
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
| -rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 2 |
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 | ||