From 9add99b31aabf00af78cb4b999c3cbbff1a36847 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 6 Jan 2023 19:04:49 +0200
Subject: [PATCH] SL-18879 Fixed: Very transparent faces can no longer be
selected
---
indra/newview/llviewerwindow.cpp | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index aecfd40b252..bc4f00bd3f9 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -4188,14 +4188,11 @@ void LLViewerWindow::pickAsync( S32 x,
{
// "Show Debug Alpha" means no object actually transparent
BOOL in_build_mode = LLFloaterReg::instanceVisible("build");
- if (LLDrawPoolAlpha::sShowDebugAlpha)
+ if (LLDrawPoolAlpha::sShowDebugAlpha
+ || (in_build_mode && gSavedSettings.getBOOL("SelectInvisibleObjects")))
{
pick_transparent = TRUE;
}
- else if (in_build_mode && !gSavedSettings.getBOOL("SelectInvisibleObjects"))
- {
- pick_transparent = FALSE;
- }
LLPickInfo pick_info(LLCoordGL(x, y_from_bot), mask, pick_transparent, pick_rigged, FALSE, TRUE, pick_unselectable, callback);
schedulePick(pick_info);
--
GitLab