diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-12-05 17:40:04 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-12-05 17:40:04 -0500 |
| commit | 295a4c63b4912f05a729178e8e34ba26e92ff37b (patch) | |
| tree | 19fc1232fc6f8040ce5598fdd9649646116f7ea9 /indra/newview/llagentcamera.cpp | |
| parent | 2d8ad89f33e9fa65dea11fd4c78962fc568ee00a (diff) | |
| parent | 05d58c91ef55fd90ea2f3e0f1a1199ac5e690b30 (diff) | |
merge changes for 5.0.0-release
Diffstat (limited to 'indra/newview/llagentcamera.cpp')
| -rw-r--r-- | indra/newview/llagentcamera.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index fa16f02c16..e335eabd1a 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -1448,6 +1448,7 @@ void LLAgentCamera::updateCamera() diff.mV[VZ] = 0.f; } + // SL-315 gAgentAvatarp->mPelvisp->setPosition(gAgentAvatarp->mPelvisp->getPosition() + diff); gAgentAvatarp->mRoot->updateWorldMatrixChildren(); @@ -2144,6 +2145,7 @@ void LLAgentCamera::changeCameraToFollow(BOOL animate) if (isAgentAvatarValid()) { + // SL-315 gAgentAvatarp->mPelvisp->setPosition(LLVector3::zero); gAgentAvatarp->startMotion( ANIM_AGENT_BODY_NOISE ); gAgentAvatarp->startMotion( ANIM_AGENT_BREATHE_ROT ); @@ -2184,6 +2186,7 @@ void LLAgentCamera::changeCameraToThirdPerson(BOOL animate) { if (!gAgentAvatarp->isSitting()) { + // SL-315 gAgentAvatarp->mPelvisp->setPosition(LLVector3::zero); } gAgentAvatarp->startMotion(ANIM_AGENT_BODY_NOISE); |