summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2015-12-14 12:06:14 +0200
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2015-12-14 12:06:14 +0200
commitd81bfeab44743efec3a6fa01123fd769b5d86d52 (patch)
treeef0f7f9f982c0ec051888c7f0444887e3f097a10 /indra/newview
parent97dbd3768af3a1dfd888f3eda39224e52d20e74f (diff)
MAINT-957 WIP Double-click Auto-pilot activates for clicks on UI elements, HUDs, some right-clicks
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/lltoolpie.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 4872a65fb3..e400edec16 100755
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -749,6 +749,15 @@ BOOL LLToolPie::handleDoubleClick(S32 x, S32 y, MASK mask)
FALSE /* ignore transparent */,
FALSE /* ignore particles */);
+ if(mPick.mPickType == LLPickInfo::PICK_OBJECT)
+ {
+ if (mPick.getObject() && mPick.getObject()->isHUDAttachment())
+ {
+ mPick = savedPick;
+ return FALSE;
+ }
+ }
+
if ((mPick.mPickType == LLPickInfo::PICK_LAND && !mPick.mPosGlobal.isExactlyZero()) ||
(mPick.mObjectID.notNull() && !mPick.mPosGlobal.isExactlyZero()))
{