livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged in lindenlab/viewer-lynx

meow-7.2.2
AndreyL ProductEngine 2017-03-29 03:15:21 +03:00
parent 084f7cf44a 45dd355d46
commit d9effe167d
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llagentcamera.cpp
View File

@ -1537,11 +1537,14 @@ 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;
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)

2
indra/newview/skins/default/xui/en/floater_flickr.xml
View File

@ -9,7 +9,7 @@
save_rect="true"
single_instance="true"
reuse_instance="true"
title="UPLOAD TO FLICKR"
title="SHARE TO FLICKR"
height="590"
width="272">
<panel

2
indra/newview/skins/default/xui/en/panel_flickr_photo.xml
View File

@ -237,7 +237,7 @@ Use "" for multi-word tags
top_pad="7"
left="10"
height="23"
label="Upload"
label="Share"
name="post_photo_btn"
width="100">
<button.commit_callback