diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-06-04 14:39:08 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-06-04 14:39:08 -0400 |
| commit | 2f87c07a0f4986b641c94de5e7e29251ba1a2d97 (patch) | |
| tree | e58154d9e31ee4493b6284ac4b5bd1e7b177c56d /indra/newview/llface.h | |
| parent | 9acabccdde5cff91cac3bae0502c8ff5b26cada6 (diff) | |
| parent | a3a933e2120e4edf3c7f3c85a8ca04d76570f8ec (diff) | |
merge changes for build number fix
Diffstat (limited to 'indra/newview/llface.h')
| -rwxr-xr-x | indra/newview/llface.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llface.h b/indra/newview/llface.h index 453d2c23d4..0687544d53 100755 --- a/indra/newview/llface.h +++ b/indra/newview/llface.h @@ -118,7 +118,7 @@ public: LLXformMatrix* getXform() const { return mXform; } BOOL hasGeometry() const { return mGeomCount > 0; } LLVector3 getPositionAgent() const; - LLVector2 surfaceToTexture(LLVector2 surface_coord, LLVector3 position, LLVector3 normal); + LLVector2 surfaceToTexture(LLVector2 surface_coord, const LLVector4a& position, const LLVector4a& 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; |