summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2024-01-18 02:18:39 +0200
committerAndrey Kleshchev <117672381+akleshchev@users.noreply.github.com>2024-01-18 18:32:04 +0200
commit90aa7f0042b0793e205a399dcf82a246ed089526 (patch)
tree74da144d78429297badfd2765a7686a499869165
parenta67dde1f16c144247cff0b765201e64f8f8e75c2 (diff)
SL-20723 CLICK_ACTION_IGNORE was ignored on some attachments
Now should match LLOctreeIntersect's check
-rw-r--r--indra/newview/llvovolume.cpp5
1 files changed, 5 insertions, 0 deletions
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();