diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-08-26 14:34:50 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-08-26 14:34:50 -0400 |
| commit | 838c01e87d69a29f39554fbc5fa972ddd3baace1 (patch) | |
| tree | 7d38ae0017f606ef12416ab8a9ce80dcd966ed77 /indra/newview/llface.h | |
| parent | 1a8d917a6d0d2393a0f0248d0072dd7cfd487609 (diff) | |
| parent | b2b670d787eaa1789b87a62178c970dfb20c02d2 (diff) | |
re-merge change from Thickbrick (minor collisions with changes from viewer-public merge)
Diffstat (limited to 'indra/newview/llface.h')
| -rw-r--r-- | indra/newview/llface.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llface.h b/indra/newview/llface.h index d95057f3ef..0166e45bee 100644 --- a/indra/newview/llface.h +++ b/indra/newview/llface.h @@ -89,6 +89,9 @@ public: BOOL hasGeometry() const { return mGeomCount > 0; } LLVector3 getPositionAgent() const; LLVector2 surfaceToTexture(LLVector2 surface_coord, LLVector3 position, LLVector3 normal); + void getPlanarProjectedParams(LLQuaternion* face_rot, LLVector3* face_pos, F32* scale) const; + bool calcAlignedPlanarTE(const LLFace* align_to, LLVector2* st_offset, + LLVector2* st_scale, F32* st_rot) const; U32 getState() const { return mState; } void setState(U32 state) { mState |= state; } |