summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolselect.cpp
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2018-11-15 14:32:18 -0800
committerGraham Linden <graham@lindenlab.com>2018-11-15 14:32:18 -0800
commitba1fbddc2dbc526ee89e7d79b35cf3e0a46e3add (patch)
treed779020d73e73a8eb9fa8731c362b8708c8837ef /indra/newview/lltoolselect.cpp
parent2783783575a9b712eb318b450dc5e6bb17d7f7c5 (diff)
parenta0a1d93fb6a74149bbef57f1d1489510247110ca (diff)
Merge 6ish
Diffstat (limited to 'indra/newview/lltoolselect.cpp')
-rw-r--r--indra/newview/lltoolselect.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lltoolselect.cpp b/indra/newview/lltoolselect.cpp
index c22eb48eef..e52bc0b015 100644
--- a/indra/newview/lltoolselect.cpp
+++ b/indra/newview/lltoolselect.cpp
@@ -64,7 +64,8 @@ LLToolSelect::LLToolSelect( LLToolComposite* composite )
BOOL LLToolSelect::handleMouseDown(S32 x, S32 y, MASK mask)
{
// do immediate pick query
- mPick = gViewerWindow->pickImmediate(x, y, TRUE, FALSE);
+ BOOL pick_rigged = false; //gSavedSettings.getBOOL("AnimatedObjectsAllowLeftClick");
+ mPick = gViewerWindow->pickImmediate(x, y, TRUE, pick_rigged);
// Pass mousedown to agent
LLTool::handleMouseDown(x, y, mask);