diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-24 19:53:29 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-24 19:53:29 +0300 |
| commit | e5b14e4c2ceac66cd1083c497f4bc4edc4e43436 (patch) | |
| tree | fa37803eb1815775a10c86264c643a932a87fca9 /indra/newview/llagentcamera.cpp | |
| parent | b1b2ae00cad6c624ae3ce45bd27bc07f48ce70dd (diff) | |
| parent | 195a6c56f4899790c5016b5d5b8cb701134a514f (diff) | |
Merge pull request #1315 from secondlife/marchcat/c-merge
Release (Maint YZ) -> Maint C merge
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; } |