diff options
| author | Rider Linden <rider@lindenlab.com> | 2017-05-01 09:04:14 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2017-05-01 09:04:14 -0700 |
| commit | bb0e2e6b957f9abf3ddc819d20aea3936d500467 (patch) | |
| tree | bc6ed362332740ea6e5829966d1afd618f1b60fb /indra/newview/llagentcamera.cpp | |
| parent | dca8d3b5f569ed0b074a58cd054ea3065a15a717 (diff) | |
| parent | f62b5503285d828813d87779fa0658ee5f122ac5 (diff) | |
Merged lindenlab/viewer-release into default
Diffstat (limited to 'indra/newview/llagentcamera.cpp')
| -rw-r--r-- | indra/newview/llagentcamera.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index e335eabd1a..5b9f1b9d4f 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -1537,6 +1537,14 @@ LLVector3d LLAgentCamera::calcFocusPositionTargetGlobal() } else if (mCameraMode == CAMERA_MODE_CUSTOMIZE_AVATAR) { + if (mFocusOnAvatar) + { + LLVector3 focus_target = isAgentAvatarValid() + ? gAgentAvatarp->mHeadp->getWorldPosition() + : gAgent.getPositionAgent(); + LLVector3d focus_target_global = gAgent.getPosGlobalFromAgent(focus_target); + mFocusTargetGlobal = focus_target_global; + } return mFocusTargetGlobal; } else if (!mFocusOnAvatar) |