summaryrefslogtreecommitdiff
path: root/indra/newview/llcontrolavatar.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2017-07-18 19:33:14 +0100
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2017-07-18 19:33:14 +0100
commit6837ca5cd899d0aba71f856f540b535a7fc78595 (patch)
treeea2825efc64add1b852f914b0320f70acaefa51b /indra/newview/llcontrolavatar.h
parentbcfc1931dd799564b25e0043dc2cb5f388cee8d0 (diff)
SL-727 - right-click menus and hover info ignore control avatars.
Diffstat (limited to 'indra/newview/llcontrolavatar.h')
-rw-r--r--indra/newview/llcontrolavatar.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llcontrolavatar.h b/indra/newview/llcontrolavatar.h
index 1be2d58441..a6b77b73ba 100644
--- a/indra/newview/llcontrolavatar.h
+++ b/indra/newview/llcontrolavatar.h
@@ -55,6 +55,17 @@ public:
void getAnimatedVolumes(std::vector<LLVOVolume*>& volumes);
void updateAnimations();
+ virtual LLViewerObject* lineSegmentIntersectRiggedAttachments(
+ const LLVector4a& start, const LLVector4a& end,
+ S32 face = -1, // which face to check, -1 = ALL_SIDES
+ BOOL pick_transparent = FALSE,
+ BOOL pick_rigged = FALSE,
+ S32* face_hit = NULL, // which face was hit
+ LLVector4a* intersection = NULL, // return the intersection point
+ LLVector2* tex_coord = NULL, // return the texture coordinates of the intersection point
+ LLVector4a* normal = NULL, // return the surface normal at the intersection point
+ LLVector4a* tangent = NULL); // return the surface tangent at the intersection point
+
virtual void updateDebugText();
bool mPlaying;