Merged in lindenlab/viewer-lynx

indra/newview/llagentcamera.cpp

@@ -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)

indra/newview/skins/default/xui/en/floater_flickr.xml

@@ -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

indra/newview/skins/default/xui/en/panel_flickr_photo.xml

@@ -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