SL-714 - Right-click rigged mesh shouldn't select the control av

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;

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)