SL-11514

Convince Geenzo code to get a little DeMorgan in it.

Trophy Unlocked: make all alpha textures partcipate in picking.

2 files changed, 3 insertions, 25 deletions

diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index d5ffdef4c9..f184b22ccb 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -112,26 +112,6 @@ BOOL LLToolPie::handleMouseDown(S32 x, S32 y, MASK mask)
 	mMouseDownX = x;
 	mMouseDownY = y;
 
-#if 0
-	LLTimer pick_timer;
-	BOOL pick_rigged = false; //gSavedSettings.getBOOL("AnimatedObjectsAllowLeftClick");
-	mPick = gViewerWindow->pickImmediate(x, y, FALSE, pick_rigged);
-	LLViewerObject *object = mPick.getObject();
-	LLViewerObject *parent = object ? object->getRootEdit() : NULL;
-	if (!object
-		|| object->isAttachment()
-		|| object->getClickAction() == CLICK_ACTION_DISABLED
-		|| (!useClickAction(mask, object, parent) && !object->flagHandleTouch() && !(parent && parent->flagHandleTouch())))
-	{
-		// Unless we are hovering over actionable visible object
-		// 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
-		mPick = gViewerWindow->pickImmediate(x, y, TRUE /*transparent*/, pick_rigged);
-	}
-	LL_INFOS() << "pick_rigged is " << (S32) pick_rigged << " pick time elapsed " << pick_timer.getElapsedTimeF32() << LL_ENDL;
-#endif
-
 	//left mouse down always picks transparent (but see handleMouseUp)
 	mPick = gViewerWindow->pickImmediate(x, y, TRUE, FALSE);
 	mPick.mKeyMask = mask;
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 3866045b1d..dcefa22e75 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -4579,12 +4579,10 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector4a& start, const LLVector4a&
 					}
 				}
 
+                BOOL no_texture = !face->getTexture() || !face->getTexture()->hasGLTexture();
+                BOOL mask       = no_texture ? FALSE : face->getTexture()->getMask(face->surfaceToTexture(tc, p, n));
 				if (face &&
-					(ignore_alpha ||
-					pick_transparent || 
-					!face->getTexture() || 
-					!face->getTexture()->hasGLTexture() || 
-					face->getTexture()->getMask(face->surfaceToTexture(tc, p, n))))
+					(ignore_alpha || pick_transparent || no_texture || mask))
 				{
 					local_end = p;
 					if (face_hitp != NULL)