Merge viewer-bear

master
Ansariel 2015-12-22 20:57:45 +01:00
commit 3acbcd75d2
1 changed files with 1 additions and 4 deletions

View File

@ -130,10 +130,7 @@ BOOL LLToolPie::handleMouseDown(S32 x, S32 y, MASK mask)
BOOL LLToolPie::handleRightMouseDown(S32 x, S32 y, MASK mask)
{
// don't pick transparent so users can't "pay" transparent objects
// mPick = gViewerWindow->pickImmediate(x, y, FALSE, TRUE);
// [SL:KB] - Patch: UI-PickRiggedAttachment | Checked: 2012-07-12 (Catznip-3.3)
mPick = gViewerWindow->pickImmediate(x, y, FALSE, TRUE, TRUE);
// [/SL:KB]
mPick = gViewerWindow->pickImmediate(x, y, /*BOOL pick_transparent*/ FALSE, /*BOOL pick_rigged*/ TRUE, /*BOOL pick_particle*/ TRUE);
mPick.mKeyMask = mask;
// claim not handled so UI focus stays same