From 3e6aafb489dec10f695f5dd2e04395ff473cfc50 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Wed, 22 Mar 2017 18:41:51 +0200 Subject: MAINT-6789 MAC build fix --- indra/newview/llblocklist.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llblocklist.cpp b/indra/newview/llblocklist.cpp index 54617169c8..1eab2d8e23 100644 --- a/indra/newview/llblocklist.cpp +++ b/indra/newview/llblocklist.cpp @@ -220,7 +220,7 @@ void LLBlockList::refresh() else if(mActionType == REMOVE) { if ((mute.mID.notNull() && selected.isUUID() && selected.asUUID() == mute.mID) - || mute.mID.isNull() && selected.isString() && selected.asString() == mute.mName) + || (mute.mID.isNull() && selected.isString() && selected.asString() == mute.mName)) { // we are going to remove currently selected item, so select next item and save the selection to restore it if (!selectNextItemPair(false, true)) -- cgit v1.2.3 From 83694e1404b27a74053a4567b9546e06845f5fbb Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Thu, 23 Mar 2017 12:08:31 +0200 Subject: MAINT-7237 Change Flickr upload button label & window title name --- indra/newview/skins/default/xui/en/floater_flickr.xml | 2 +- indra/newview/skins/default/xui/en/panel_flickr_photo.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/skins/default/xui/en/floater_flickr.xml b/indra/newview/skins/default/xui/en/floater_flickr.xml index 52ef16c7e8..3b9c4894c1 100644 --- a/indra/newview/skins/default/xui/en/floater_flickr.xml +++ b/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"> Date: Tue, 28 Mar 2017 12:30:20 +0300 Subject: Backed out changeset: 50e72280019f --- indra/newview/llagentcamera.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 7723dbf978..e335eabd1a 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -1537,11 +1537,6 @@ 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) -- cgit v1.2.3 From 45dd355d46dc8ea5a0a6934722ffc76f9d955a9f Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Tue, 28 Mar 2017 13:56:01 +0300 Subject: MAINT-1858 Fixed camera not looking at avatar if "Editing Appearance" while moving --- indra/newview/llagentcamera.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) 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) -- cgit v1.2.3