diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-01-31 23:06:53 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-01-31 23:06:53 +0000 |
| commit | 2456715a407cc11f3e0077cb3c54e21188e6ec86 (patch) | |
| tree | b52162e8c228c2822d9a1165a1c81dfa3e47661e /indra/newview/lldrawpoolwater.h | |
| parent | 29e8215faaf0ed949ffadd81eeb92b43d6af1f3f (diff) | |
| parent | f1ee481b82275cfadbce156514920750ebdd3065 (diff) | |
Merged in graham_linden/viewer-eep-fixes (pull request #253)
SL-10443, SL-9994, SL-10374, SL-10081
Diffstat (limited to 'indra/newview/lldrawpoolwater.h')
| -rw-r--r-- | indra/newview/lldrawpoolwater.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolwater.h b/indra/newview/lldrawpoolwater.h index f14ac1f6d2..f94baefc41 100644 --- a/indra/newview/lldrawpoolwater.h +++ b/indra/newview/lldrawpoolwater.h @@ -33,6 +33,7 @@ class LLFace; class LLHeavenBody; class LLWaterSurface; +class LLGLSLShader; class LLDrawPoolWater: public LLFacePool { @@ -81,6 +82,7 @@ public: void renderReflection(LLFace* face); void shade(); + void shade2(bool edge, LLGLSLShader* shader, const LLColor3& light_diffuse, const LLVector3& light_dir, F32 light_exp); void setTransparentTextures(const LLUUID& transparentTextureId, const LLUUID& nextTransparentTextureId); void setOpaqueTexture(const LLUUID& opaqueTextureId); |