diff options
author | ubit | 2012-12-11 05:49:52 +0100 |
---|---|---|
committer | ubit | 2012-12-11 05:49:52 +0100 |
commit | 377e6f44e71a6a4b8dac9cdf2e671971b76b1605 (patch) | |
tree | b0a6929372f6016c3cb885f3fb1aff6f552169c8 /OpenSim/Region/Physics/Manager | |
parent | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
parent | missing files remove some warnings... (diff) | |
download | opensim-SC-377e6f44e71a6a4b8dac9cdf2e671971b76b1605.zip opensim-SC-377e6f44e71a6a4b8dac9cdf2e671971b76b1605.tar.gz opensim-SC-377e6f44e71a6a4b8dac9cdf2e671971b76b1605.tar.bz2 opensim-SC-377e6f44e71a6a4b8dac9cdf2e671971b76b1605.tar.xz |
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index 0405dad..e39cee7 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
@@ -71,6 +71,15 @@ namespace OpenSim.Region.Physics.Manager | |||
71 | RelativeSpeed = 0f; // for now let this one be set explicity | 71 | RelativeSpeed = 0f; // for now let this one be set explicity |
72 | CharacterFeet = true; // keep other plugins work as before | 72 | CharacterFeet = true; // keep other plugins work as before |
73 | } | 73 | } |
74 | |||
75 | public ContactPoint(Vector3 position, Vector3 surfaceNormal, float penetrationDepth, bool feet) | ||
76 | { | ||
77 | Position = position; | ||
78 | SurfaceNormal = surfaceNormal; | ||
79 | PenetrationDepth = penetrationDepth; | ||
80 | RelativeSpeed = 0f; // for now let this one be set explicity | ||
81 | CharacterFeet = feet; // keep other plugins work as before | ||
82 | } | ||
74 | } | 83 | } |
75 | 84 | ||
76 | public struct ContactData | 85 | public struct ContactData |