diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-05-26 03:07:14 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-05-26 03:07:14 +0300 |
| commit | 58a500bee8dc06acb35acb5c2e5c65d2df99a0d8 (patch) | |
| tree | 9ce445b7171e208842baaa0da5a76a57516b33d5 /indra/newview/lldrawpoolwater.h | |
| parent | 2242f089e4da03b361255a8a5175c788a99cbf8e (diff) | |
| parent | cdbd06e8ed6e3f4285a61f5c0b607a65dfdf8dfd (diff) | |
Merge branch 'master' into DRTVWR-561-maint-O
Diffstat (limited to 'indra/newview/lldrawpoolwater.h')
| -rw-r--r-- | indra/newview/lldrawpoolwater.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolwater.h b/indra/newview/lldrawpoolwater.h index a5d163e0d7..6f2fc3271d 100644 --- a/indra/newview/lldrawpoolwater.h +++ b/indra/newview/lldrawpoolwater.h @@ -78,8 +78,7 @@ public: /*virtual*/ LLColor3 getDebugColor() const; // For AGP debug display void renderReflection(LLFace* face); - void shade(); - void shade2(bool edge, LLGLSLShader* shader, const LLColor3& light_diffuse, const LLVector3& light_dir, F32 light_exp); + void renderWater(); void setTransparentTextures(const LLUUID& transparentTextureId, const LLUUID& nextTransparentTextureId); void setOpaqueTexture(const LLUUID& opaqueTextureId); |