diff options
| author | Karl Steifvater <qarl@lindenlab.com> | 2008-07-23 21:20:19 +0000 |
|---|---|---|
| committer | Karl Steifvater <qarl@lindenlab.com> | 2008-07-23 21:20:19 +0000 |
| commit | 52562e2e664c70dcd476291820ac02b893e489b8 (patch) | |
| tree | 5137f49f194a6a28f290385c38f689d77656b2e0 /indra/newview/llface.h | |
| parent | bc39ad916e8f23ffae12184eee675aa7c1be2ca9 (diff) | |
svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge
QAR-698 / DEV-9985 add touch "position" information to touch-events in LSL
Diffstat (limited to 'indra/newview/llface.h')
| -rw-r--r-- | indra/newview/llface.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llface.h b/indra/newview/llface.h index 0391cda66f..9e7a33eb7b 100644 --- a/indra/newview/llface.h +++ b/indra/newview/llface.h @@ -91,6 +91,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); U32 getState() const { return mState; } void setState(U32 state) { mState |= state; } @@ -165,7 +166,7 @@ public: void update(); void updateCenterAgent(); // Update center when xform has changed. - void renderSelectedUV(const S32 offset = 0, const S32 count = 0); + void renderSelectedUV(); void renderForSelect(U32 data_mask = LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD); void renderSelected(LLImageGL *image, const LLColor4 &color); |