aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-08-10 23:56:19 +0100
committerJustin Clark-Casey (justincc)2011-08-10 23:56:19 +0100
commit7f499ff3f386d57bcd81ebb3f58f110011100604 (patch)
treebab34762e4a9cb9e739df591360cec3405bb4e57 /OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
parentfly and no fly constants for osNpcMoveToTarget() (diff)
downloadopensim-SC-7f499ff3f386d57bcd81ebb3f58f110011100604.zip
opensim-SC-7f499ff3f386d57bcd81ebb3f58f110011100604.tar.gz
opensim-SC-7f499ff3f386d57bcd81ebb3f58f110011100604.tar.bz2
opensim-SC-7f499ff3f386d57bcd81ebb3f58f110011100604.tar.xz
Add a OS_NPC_LAND_AT_TARGET option to osMoveToTarget()
Default for this function is now not to automatically land. This allows better control by scripts when an avatar is going to be landing on a prim rather than the ground. Stopping the avatar involves faking a collision, to avoid the pid controller making it overshoot. A better approach would be to gradually slow the avatar as we near the target
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODECharacter.cs')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 4f461ad..ecf5983 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -305,10 +305,12 @@ namespace OpenSim.Region.Physics.OdePlugin
305 { 305 {
306 m_iscolliding = true; 306 m_iscolliding = true;
307 } 307 }
308
308 if (m_wascolliding != m_iscolliding) 309 if (m_wascolliding != m_iscolliding)
309 { 310 {
310 //base.SendCollisionUpdate(new CollisionEventUpdate()); 311 //base.SendCollisionUpdate(new CollisionEventUpdate());
311 } 312 }
313
312 m_wascolliding = m_iscolliding; 314 m_wascolliding = m_iscolliding;
313 } 315 }
314 } 316 }