diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-08-13 15:24:38 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-08-13 15:24:38 -0700 |
| commit | 7a64e8f8bfeff17d6a5385a6c39f1056214cb59f (patch) | |
| tree | 987929b16e1c86fb4deece020fe148c349b4c39d /indra/newview/llface.h | |
| parent | 4bf2d7b906ee025e94a2e233188934e8f3bf412a (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 5a217411da..7f07178fb5 100644 --- a/indra/newview/llface.h +++ b/indra/newview/llface.h @@ -115,7 +115,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; } @@ -199,7 +199,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; } |