diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-09-23 01:53:11 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-09-23 01:53:11 +0000 |
| commit | afe61eb994377e25d60d0a0893510a693149c6be (patch) | |
| tree | 80c6e33cd664e5c8b1c5f55c3b7b49c081dd590a /indra/newview/llagent.cpp | |
| parent | 2945882258ad1befe8e8094c0a1a655e4ddbcd30 (diff) | |
QAR-849 merge maint-viewer-10-merge 96838-97237 -> release
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 19a0676374..36e4182e37 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -4103,7 +4103,10 @@ void LLAgent::changeCameraToThirdPerson(BOOL animate) if (mAvatarObject) { - mAvatarObject->mPelvisp->setPosition(LLVector3::zero); + if (!mAvatarObject->mIsSitting) + { + mAvatarObject->mPelvisp->setPosition(LLVector3::zero); + } mAvatarObject->startMotion( ANIM_AGENT_BODY_NOISE ); mAvatarObject->startMotion( ANIM_AGENT_BREATHE_ROT ); } |