diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-07-17 23:05:38 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-07-17 23:05:38 +0100 |
| commit | bcfc1931dd799564b25e0043dc2cb5f388cee8d0 (patch) | |
| tree | 9072ea92c9a3fb09c249c361ca0c22fb3c17beb9 /indra/newview | |
| parent | c4bc677a407049e406bde925df1537f157bda0c3 (diff) | |
SL-714 - Right-click rigged mesh shouldn't select the control av
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lltoolpie.cpp | 9 | ||||
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 5 |
2 files changed, 6 insertions, 8 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index a1b3caf38b..a06aeb5631 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -1750,8 +1750,7 @@ BOOL LLToolPie::handleRightClickPick() gMenuHolder->setObjectSelection(LLSelectMgr::getInstance()->getSelection()); bool is_other_attachment = (object->isAttachment() && !object->isHUDAttachment() && !object->permYouOwner()); - if (object->isAvatar() - || is_other_attachment) + if (object->isAvatar() || is_other_attachment) { // Find the attachment's avatar while( object && object->isAttachment()) @@ -1764,12 +1763,6 @@ BOOL LLToolPie::handleRightClickPick() { return TRUE; // unexpected, but escape } -#if 0 // AXON TBD - if (object->asAvatar() && object->asAvatar()->isControlAvatar()) - { - return TRUE; // control avatars are not people... - } -#endif // Object is an avatar, so check for mute by id. LLVOAvatar* avatar = (LLVOAvatar*)object; diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index b202f1b848..ee570c8345 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -1614,6 +1614,11 @@ BOOL LLVOAvatar::lineSegmentIntersect(const LLVector4a& start, const LLVector4a& return FALSE; } + if (isControlAvatar()) + { + return FALSE; + } + if (lineSegmentBoundingBox(start, end)) { for (S32 i = 0; i < mNumCollisionVolumes; ++i) |