diff options
author | Jacek Antonelli | 2008-12-01 17:39:58 -0600 |
---|---|---|
committer | Jacek Antonelli | 2008-12-01 17:40:06 -0600 |
commit | 7abecb48babe6a6f09bf6692ba55076546cfced9 (patch) | |
tree | 8d18a88513fb97adf32c10aae78f4be1984942db /linden/indra/newview/llvoavatar.h | |
parent | Second Life viewer sources 1.21.6 (diff) | |
download | meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.zip meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.gz meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.bz2 meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.xz |
Second Life viewer sources 1.22.0-RC
Diffstat (limited to 'linden/indra/newview/llvoavatar.h')
-rw-r--r-- | linden/indra/newview/llvoavatar.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h index d66ddfc..8265e8a 100644 --- a/linden/indra/newview/llvoavatar.h +++ b/linden/indra/newview/llvoavatar.h | |||
@@ -308,6 +308,16 @@ public: | |||
308 | U32 renderTransparent(); | 308 | U32 renderTransparent(); |
309 | void renderCollisionVolumes(); | 309 | void renderCollisionVolumes(); |
310 | 310 | ||
311 | /*virtual*/ BOOL lineSegmentIntersect(const LLVector3& start, const LLVector3& end, | ||
312 | S32 face = -1, // which face to check, -1 = ALL_SIDES | ||
313 | BOOL pick_transparent = FALSE, | ||
314 | S32* face_hit = NULL, // which face was hit | ||
315 | LLVector3* intersection = NULL, // return the intersection point | ||
316 | LLVector2* tex_coord = NULL, // return the texture coordinates of the intersection point | ||
317 | LLVector3* normal = NULL, // return the surface normal at the intersection point | ||
318 | LLVector3* bi_normal = NULL // return the surface bi-normal at the intersection point | ||
319 | ); | ||
320 | |||
311 | /*virtual*/ void updateTextures(LLAgent &agent); | 321 | /*virtual*/ void updateTextures(LLAgent &agent); |
312 | // If setting a baked texture, need to request it from a non-local sim. | 322 | // If setting a baked texture, need to request it from a non-local sim. |
313 | /*virtual*/ S32 setTETexture(const U8 te, const LLUUID& uuid); | 323 | /*virtual*/ S32 setTETexture(const U8 te, const LLUUID& uuid); |