summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2017-03-16 19:23:26 +0200
committerandreykproductengine <akleshchev@productengine.com>2017-03-16 19:23:26 +0200
commit1132b33028b056fce6474879e06b077c6f9cb50e (patch)
tree7ff3b7556fb48545fb35a135c05bf49888ade3fe /indra/newview
parent3c637e49452229e8df3cce833a275daaef650d9c (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.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index e335eabd1a..7723dbf978 100644
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -1537,6 +1537,11 @@ LLVector3d LLAgentCamera::calcFocusPositionTargetGlobal()
}
else if (mCameraMode == CAMERA_MODE_CUSTOMIZE_AVATAR)
{
+ 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)