summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2023-01-06 19:04:49 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2023-01-06 19:05:51 +0200
commit9add99b31aabf00af78cb4b999c3cbbff1a36847 (patch)
tree22ef82bf06b852dc6d5bf8f4ed481c1ad2ed41c8 /indra/newview
parenta21ef13880426a8d384002f4d49dd9d506672671 (diff)
SL-18879 Fixed: Very transparent faces can no longer be selected
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewerwindow.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index aecfd40b25..bc4f00bd3f 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);