diff options
| author | Roxanne Skelly <roxanne@roxiware.com> | 2024-05-08 17:41:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-08 17:41:46 -0700 |
| commit | be19e495c5483c06b9b90dd18bf8ebbe7ceaa336 (patch) | |
| tree | 4d51dd366e2e2ce69610a06e7ab767824ab8869c /indra/newview/llagentcamera.cpp | |
| parent | 818c8c6deaa755c02b64fb03766ee03d66021968 (diff) | |
| parent | 70af754dc09e29a492828e7cc4ed5db8d32eda3d (diff) | |
Merge pull request #1440 from secondlife/roxie/webrtc-voice
Diffstat (limited to 'indra/newview/llagentcamera.cpp')
| -rw-r--r-- | indra/newview/llagentcamera.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 8977b145d1..0d0d6e7e46 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -1779,7 +1779,7 @@ LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(BOOL *hit_limit) head_offset.clearVec(); F32 fixup; - if (gAgentAvatarp->hasPelvisFixup(fixup)) + if (gAgentAvatarp->hasPelvisFixup(fixup) && !gAgentAvatarp->isSitting()) { head_offset[VZ] -= fixup; } |