diff options
author | UbitUmarov | 2012-12-17 01:40:48 +0000 |
---|---|---|
committer | UbitUmarov | 2012-12-17 01:40:48 +0000 |
commit | d003aa2e7b690d21f7d6094431c16ad0de5776d4 (patch) | |
tree | 47551aa6ded0d56bf1eff5e554a3cc0bbeeeebba /OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | |
parent | right fix this time ?? (diff) | |
download | opensim-SC_OLD-d003aa2e7b690d21f7d6094431c16ad0de5776d4.zip opensim-SC_OLD-d003aa2e7b690d21f7d6094431c16ad0de5776d4.tar.gz opensim-SC_OLD-d003aa2e7b690d21f7d6094431c16ad0de5776d4.tar.bz2 opensim-SC_OLD-d003aa2e7b690d21f7d6094431c16ad0de5776d4.tar.xz |
* TEST * unscripted sit
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs index 15eb01f..fbf2f0d 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | |||
@@ -362,8 +362,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
362 | 362 | ||
363 | nearCallback = near; | 363 | nearCallback = near; |
364 | 364 | ||
365 | m_rayCastManager = new ODERayCastRequestManager(this); | 365 | m_rayCastManager = new ODERayCastRequestManager(this); |
366 | |||
367 | 366 | ||
368 | lock (OdeLock) | 367 | lock (OdeLock) |
369 | { | 368 | { |
@@ -2711,5 +2710,17 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2711 | } | 2710 | } |
2712 | return new List<ContactResult>(); | 2711 | return new List<ContactResult>(); |
2713 | } | 2712 | } |
2713 | |||
2714 | public override int SitAvatar(PhysicsActor actor, Vector3 AbsolutePosition, Vector3 CameraPosition, Vector3 offset, Vector3 AvatarSize, SitAvatarCallback PhysicsSitResponse) | ||
2715 | { | ||
2716 | Util.FireAndForget( delegate | ||
2717 | { | ||
2718 | ODESitAvatar sitAvatar = new ODESitAvatar(this, m_rayCastManager); | ||
2719 | if(sitAvatar != null) | ||
2720 | sitAvatar.Sit(actor, AbsolutePosition, CameraPosition, offset, AvatarSize, PhysicsSitResponse); | ||
2721 | }); | ||
2722 | return 1; | ||
2723 | } | ||
2724 | |||
2714 | } | 2725 | } |
2715 | } | 2726 | } |