diff options
author | Melanie | 2012-12-17 02:01:47 +0100 |
---|---|---|
committer | Melanie | 2012-12-17 02:01:47 +0100 |
commit | 51354bad484befe0a3a4c0b1840523e24c145235 (patch) | |
tree | d75ba724c0ff04886e8680ce9e49a5e7d498dda4 /OpenSim/Region/Physics/Manager/PhysicsScene.cs | |
parent | Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into avina... (diff) | |
parent | *TESTP unscripted sit: missing files (diff) | |
download | opensim-SC-51354bad484befe0a3a4c0b1840523e24c145235.zip opensim-SC-51354bad484befe0a3a4c0b1840523e24c145235.tar.gz opensim-SC-51354bad484befe0a3a4c0b1840523e24c145235.tar.bz2 opensim-SC-51354bad484befe0a3a4c0b1840523e24c145235.tar.xz |
Merge branch 'ubitwork' into avination
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsScene.cs')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index cdffa6b..a442cf0 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
@@ -38,6 +38,7 @@ namespace OpenSim.Region.Physics.Manager | |||
38 | 38 | ||
39 | public delegate void RaycastCallback(bool hitYN, Vector3 collisionPoint, uint localid, float distance, Vector3 normal); | 39 | public delegate void RaycastCallback(bool hitYN, Vector3 collisionPoint, uint localid, float distance, Vector3 normal); |
40 | public delegate void RayCallback(List<ContactResult> list); | 40 | public delegate void RayCallback(List<ContactResult> list); |
41 | public delegate void SitAvatarCallback(int status, uint partID, Vector3 offset, Quaternion Orientation); | ||
41 | 42 | ||
42 | public delegate void JointMoved(PhysicsJoint joint); | 43 | public delegate void JointMoved(PhysicsJoint joint); |
43 | public delegate void JointDeactivated(PhysicsJoint joint); | 44 | public delegate void JointDeactivated(PhysicsJoint joint); |
@@ -357,5 +358,9 @@ namespace OpenSim.Region.Physics.Manager | |||
357 | return new List<ContactResult>(); | 358 | return new List<ContactResult>(); |
358 | } | 359 | } |
359 | 360 | ||
361 | public virtual int SitAvatar(PhysicsActor actor, Vector3 AbsolutePosition, Vector3 CameraPosition, Vector3 offset, Vector3 AvatarSize, SitAvatarCallback PhysicsSitResponse) | ||
362 | { | ||
363 | return 0; | ||
364 | } | ||
360 | } | 365 | } |
361 | } | 366 | } |