From 90aa7f0042b0793e205a399dcf82a246ed089526 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Thu, 18 Jan 2024 02:18:39 +0200 Subject: SL-20723 CLICK_ACTION_IGNORE was ignored on some attachments Now should match LLOctreeIntersect's check --- indra/newview/llvovolume.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/newview/llvovolume.cpp') diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index ec2f490742..c5b6eca5ae 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -4575,6 +4575,11 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector4a& start, const LLVector4a& } } + if (getClickAction() == CLICK_ACTION_IGNORE && !LLFloater::isVisible(gFloaterTools)) + { + return FALSE; + } + BOOL ret = FALSE; LLVolume* volume = getVolume(); -- cgit v1.2.3