diff options
author | UbitUmarov | 2012-12-17 01:43:16 +0000 |
---|---|---|
committer | UbitUmarov | 2012-12-17 01:43:16 +0000 |
commit | 9d1a6558d9e65ab70703cea15b3752c33c4ee244 (patch) | |
tree | 6c2860ec322db522de33e83f12b7f477522db5e7 | |
parent | * TEST * unscripted sit (diff) | |
download | opensim-SC-9d1a6558d9e65ab70703cea15b3752c33c4ee244.zip opensim-SC-9d1a6558d9e65ab70703cea15b3752c33c4ee244.tar.gz opensim-SC-9d1a6558d9e65ab70703cea15b3752c33c4ee244.tar.bz2 opensim-SC-9d1a6558d9e65ab70703cea15b3752c33c4ee244.tar.xz |
*TESTP unscripted sit: missing files
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index e39cee7..9338130 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
@@ -411,6 +411,7 @@ namespace OpenSim.Region.Physics.Manager | |||
411 | // Warning in a parent part it returns itself, not null | 411 | // Warning in a parent part it returns itself, not null |
412 | public virtual PhysicsActor ParentActor { get { return this; } } | 412 | public virtual PhysicsActor ParentActor { get { return this; } } |
413 | 413 | ||
414 | |||
414 | } | 415 | } |
415 | 416 | ||
416 | public class NullPhysicsActor : PhysicsActor | 417 | public class NullPhysicsActor : PhysicsActor |
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 | } |