diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2017-03-28 13:56:01 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2017-03-28 13:56:01 +0300 |
| commit | 45dd355d46dc8ea5a0a6934722ffc76f9d955a9f (patch) | |
| tree | b270d840ad411d23047b030ea0d0a5f492e5a6b6 /indra/newview | |
| parent | 7603eb51c58db135cf5c49eb10247c8e9ea46bd8 (diff) | |
MAINT-1858 Fixed camera not looking at avatar if "Editing Appearance" while moving
Diffstat (limited to 'indra/newview')
| -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) |