diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-08-14 09:11:23 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-08-14 09:11:23 -0700 |
| commit | ed7fda069bcbf145a273b46cb2070c72d059acef (patch) | |
| tree | bddfc8f9a13d55ccb05c4a24bb3022c84197bf25 /indra/newview/llface.h | |
| parent | f03b696c3dfd859cf92db27ae7c45248d0bf8d44 (diff) | |
| parent | e9ead7cc2ee9970b468ef6de0ba57726bb203ef4 (diff) | |
Merge viewer-release 6.2.5
Diffstat (limited to 'indra/newview/llface.h')
| -rw-r--r-- | indra/newview/llface.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llface.h b/indra/newview/llface.h index 736d45b7ad..a08e730e54 100644 --- a/indra/newview/llface.h +++ b/indra/newview/llface.h @@ -114,7 +114,7 @@ public: 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; + LLVector2* st_scale, F32* st_rot, LLRender::eTexIndex map = LLRender::DIFFUSE_MAP) const; U32 getState() const { return mState; } void setState(U32 state) { mState |= state; } @@ -198,7 +198,7 @@ public: void renderSelectedUV(); void renderSelected(LLViewerTexture *image, const LLColor4 &color); - void renderOneWireframe(const LLColor4 &color, F32 fogCfx, bool wireframe_selection, bool bRenderHiddenSelections); + void renderOneWireframe(const LLColor4 &color, F32 fogCfx, bool wireframe_selection, bool bRenderHiddenSelections, bool shader); F32 getKey() const { return mDistance; } |