summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2019-12-03 17:04:02 +0200
committerandreykproductengine <andreykproductengine@lindenlab.com>2019-12-03 17:04:02 +0200
commit81c7bdea5a98b214f03807ddccd9b80182d31d4f (patch)
treedc1d62d3e824b025c6716dac4952bc7b065f5e48 /indra
parentefe2ba3bab732add39f46e1fbc3a331355a693dd (diff)
SL-11582 Alpha mask objects with cutoff == 0 don't respond to clicks
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llvovolume.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 33a9c771ea..db932c17ac 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -4567,8 +4567,9 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector4a& start, const LLVector4a&
{
U8 mode = mat->getDiffuseAlphaMode();
- if (mode == LLMaterial::DIFFUSE_ALPHA_MODE_EMISSIVE ||
- mode == LLMaterial::DIFFUSE_ALPHA_MODE_NONE)
+ if (mode == LLMaterial::DIFFUSE_ALPHA_MODE_EMISSIVE
+ || mode == LLMaterial::DIFFUSE_ALPHA_MODE_NONE
+ || (mode == LLMaterial::DIFFUSE_ALPHA_MODE_MASK && mat->getAlphaMaskCutoff() == 0))
{
ignore_alpha = true;
}