diff options
| author | Glenn Glazer <coyot@lindenlab.com> | 2016-03-08 13:32:28 -0800 |
|---|---|---|
| committer | Glenn Glazer <coyot@lindenlab.com> | 2016-03-08 13:32:28 -0800 |
| commit | ec683bb9cf6688633d8bc7ecbdf72f7cbc14d349 (patch) | |
| tree | 59ada405958cd7764a96cfa35ccc89e83706b5af /indra/newview/llvovolume.h | |
| parent | daf8b882a12cf903d180f6303065d7b83f7a1958 (diff) | |
| parent | 5a5c023e291990a463b1a91846ce82c70da8daab (diff) | |
pull from trunk
Diffstat (limited to 'indra/newview/llvovolume.h')
| -rwxr-xr-x | indra/newview/llvovolume.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h index ff7438ac09..a331908320 100755 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -140,6 +140,7 @@ public: /*virtual*/ BOOL lineSegmentIntersect(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 @@ -192,7 +193,7 @@ public: static void setTEMaterialParamsCallbackTE(const LLUUID& objectID, const LLMaterialID& pMaterialID, const LLMaterialPtr pMaterialParams, U32 te); - /*virtual*/ S32 setTEMaterialParams(const U8 te, const LLMaterialPtr pMaterialParams, bool isInitFromServer); + /*virtual*/ S32 setTEMaterialParams(const U8 te, const LLMaterialPtr pMaterialParams); /*virtual*/ S32 setTEScale(const U8 te, const F32 s, const F32 t); /*virtual*/ S32 setTEScaleS(const U8 te, const F32 s); /*virtual*/ S32 setTEScaleT(const U8 te, const F32 t); @@ -312,7 +313,7 @@ public: //rigged volume update (for raycasting) - void updateRiggedVolume(); + void updateRiggedVolume(bool force_update = false); LLRiggedVolume* getRiggedVolume(); //returns true if volume should be treated as a rigged volume |