diff options
| author | Rider Linden <rider@lindenlab.com> | 2024-09-26 11:39:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-26 11:39:35 -0700 |
| commit | 51b55e7e85882cde5051d2df6ced8c6a160e04a8 (patch) | |
| tree | d1668b2ed90a6c52c9a7fadf65d09470996ff015 /indra/newview | |
| parent | 42d52b33b4188a06d921231cd2942761c573fad6 (diff) | |
| parent | 9bf8fb38b3348da47caa26ac89072590ddec1d99 (diff) | |
Merge pull request #2689 from secondlife/rider/server_autopilot
Honor FLAGS_SERVER_AUTOPILOT and don't locally override assigned agent rotation.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 41b2c4b44b..6456c98093 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -2325,6 +2325,12 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys, // Set the rotation of the object followed by adjusting for the accumulated angular velocity (llSetTargetOmega) setRotation(new_rot * mAngularVelocityRot); + if ((mFlags & FLAGS_SERVER_AUTOPILOT) && asAvatar() && asAvatar()->isSelf()) + { + gAgent.resetAxes(); + gAgent.rotate(new_rot); + gAgentCamera.resetView(); + } setChanged(ROTATED | SILHOUETTE); } |