From 8a75b5eb18b77c30baead8d8ac42b1d63f903efe Mon Sep 17 00:00:00 2001 From: daianakproductengine Date: Fri, 16 Jun 2017 20:03:23 +0300 Subject: MAINT-200 Fixed inconsistent touch hover icon and touch click action when viewed through transparent prims --- indra/newview/lltoolpie.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/lltoolpie.cpp') diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index fc052ae3aa..b829741b3c 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -113,7 +113,7 @@ BOOL LLToolPie::handleMouseDown(S32 x, S32 y, MASK mask) mMouseDownY = y; //left mouse down always picks transparent (but see handleMouseUp) - mPick = gViewerWindow->pickImmediate(x, y, TRUE, FALSE); + mPick = gViewerWindow->pickImmediate(x, y, FALSE, FALSE); mPick.mKeyMask = mask; mMouseButtonDown = true; -- cgit v1.2.3 From 2c02c89b5805fc63b09e5a5215a771b43b59ce8e Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Fri, 25 Aug 2017 11:50:02 +0300 Subject: MAINT-7683 Use viewer autopilot instead of simulator autopilot for "click-to-walk" action. --- indra/newview/lltoolpie.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/lltoolpie.cpp') diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index b829741b3c..f7b063b398 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -485,7 +485,8 @@ void LLToolPie::walkToClickedLocation() mAutoPilotDestination->setColor(LLColor4U(170, 210, 190)); mAutoPilotDestination->setDuration(3.f); - handle_go_to(); + LLVector3d pos = LLToolPie::getInstance()->getPick().mPosGlobal; + gAgent.startAutoPilotGlobal(pos, std::string(), NULL, NULL, NULL, 0.f, 0.03f, FALSE); } // When we get object properties after left-clicking on an object -- cgit v1.2.3 From b0d3fc6292a8209a0eb246ec0ddbae0b0b58dc77 Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Thu, 31 Aug 2017 01:51:13 +0300 Subject: Backed out changeset: 1f01508fdc05 of MAINT-200 to fix BUG-134213 --- indra/newview/lltoolpie.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/lltoolpie.cpp') diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index f7b063b398..f473000657 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -113,7 +113,7 @@ BOOL LLToolPie::handleMouseDown(S32 x, S32 y, MASK mask) mMouseDownY = y; //left mouse down always picks transparent (but see handleMouseUp) - mPick = gViewerWindow->pickImmediate(x, y, FALSE, FALSE); + mPick = gViewerWindow->pickImmediate(x, y, TRUE, FALSE); mPick.mKeyMask = mask; mMouseButtonDown = true; -- cgit v1.2.3