diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-10-19 11:59:25 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-10-19 11:59:25 +0800 |
| commit | 50d273aa3011fa7655575c89d4bd36dce9d2ff16 (patch) | |
| tree | 18aaa69ad9c8182446b21128aa453309d6df1c2e /indra/newview/lltoolpie.cpp | |
| parent | aafaba28c223681db8f9a4076193b167a91c4924 (diff) | |
| parent | baaf698e29e487244863dc08661fa6754ebd1408 (diff) | |
Merge remote-tracking branch 'secondlife/DRTVWR-559' into DRTVWR-559
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
| -rw-r--r-- | indra/newview/lltoolpie.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 935d61f7ea..83a707472e 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -128,11 +128,9 @@ BOOL LLToolPie::handleMouseDown(S32 x, S32 y, MASK mask) // left mouse down always picks transparent (but see handleMouseUp). // Also see LLToolPie::handleHover() - priorities are a bit different there. // Todo: we need a more consistent set of rules to work with - if (transp_object == visible_object || !visible_object) + if (transp_object == visible_object || !visible_object || + !transp_object) // avoid potential for null dereference below, don't make assumptions about behavior of pickImmediate { - // Note: if transparent object is null, then visible object is also null - // since transparent pick includes non-tranpsarent one. - // !transparent_object check will be covered by transparent_object == visible_object. mPick = transparent_pick; } else |