diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-27 15:28:26 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-27 15:28:26 +0100 |
| commit | 524fbefd2a3b7c6955d5929d7d121ede2386c1df (patch) | |
| tree | 1eccde9b330abd27f81bfaebde29e7fa443f132a /indra/newview/llagent.cpp | |
| parent | 0b78b5a2f093ea8df3484e893eda670e4c87cff7 (diff) | |
| parent | 21f19cb6f036787d93b186d6fcfd595ae6f03d87 (diff) | |
Merge
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 |