summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2015-12-22 19:41:46 +0200
committerAndreyL ProductEngine <alihatskiy@productengine.com>2015-12-22 19:41:46 +0200
commit68e41999d5f6e0ca5e48d16f0198af949c01dbce (patch)
tree581d62ff85a76cc36f6baff7346f5ab98885e80d /indra
parentb095e2c985680660d61a99e8dbac78d9113b9870 (diff)
parent579ed3849a5b5e2d1875c1232eab44ee2f9fe7ea (diff)
Merge viewer-bear
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/lltoolpie.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 0db3297550..e17651dc91 100755
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -128,7 +128,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);
+ 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