summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2017-07-17 23:05:38 +0100
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2017-07-17 23:05:38 +0100
commitbcfc1931dd799564b25e0043dc2cb5f388cee8d0 (patch)
tree9072ea92c9a3fb09c249c361ca0c22fb3c17beb9 /indra/newview/llvoavatar.cpp
parentc4bc677a407049e406bde925df1537f157bda0c3 (diff)
SL-714 - Right-click rigged mesh shouldn't select the control av
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
-rw-r--r--indra/newview/llvoavatar.cpp5
1 files changed, 5 insertions, 0 deletions
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)