diff options
author | Oz Linden <oz@lindenlab.com> | 2018-06-21 15:31:21 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2018-06-21 15:31:21 -0400 |
commit | 3cdce9bf24ebac1c48b30955910a8f6b36797cb5 (patch) | |
tree | 5f731c4237dfe544e475c7d5f119aa2c6e8edcb8 /indra/newview/llagent.cpp | |
parent | c0e00cc61750d2b1bba3ada6622023df4725b1a4 (diff) | |
parent | dc07de2f4a4c49d1877bf743b6f0d209392f6eb6 (diff) |
merge changes for 5.1.6-release
Diffstat (limited to 'indra/newview/llagent.cpp')
-rw-r--r-- | indra/newview/llagent.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 2243cbdf5a..901294d6b4 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -1580,6 +1580,8 @@ void LLAgent::setAutoPilotTargetGlobal(const LLVector3d &target_global) LLViewerObject *obj; LLWorld::getInstance()->resolveStepHeightGlobal(NULL, target_global, traceEndPt, targetOnGround, groundNorm, &obj); + // Note: this might malfunction for sitting agent, since pelvis stays same, but agent's position becomes lower + // But for autopilot to work we assume that agent is standing and ready to go. F64 target_height = llmax((F64)gAgentAvatarp->getPelvisToFoot(), target_global.mdV[VZ] - targetOnGround.mdV[VZ]); // clamp z value of target to minimum height above ground |