diff options
author | Rider Linden <rider@lindenlab.com> | 2018-09-18 15:13:52 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2018-09-18 15:13:52 -0700 |
commit | 8d627de47874660b6781e24f801200f590cd084a (patch) | |
tree | 54275be3ca57ea64fb1bcc0adbdd26267bf56ecd /indra/newview/lldrawpoolwater.h | |
parent | 616b1e8ec1c14f04661a42c2c4cbf6410bdfac38 (diff) | |
parent | c9b2759469cb090b76a7d602eb876659c305c7f3 (diff) |
Merge
Diffstat (limited to 'indra/newview/lldrawpoolwater.h')
-rw-r--r-- | indra/newview/lldrawpoolwater.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolwater.h b/indra/newview/lldrawpoolwater.h index 3c1587885e..f14ac1f6d2 100644 --- a/indra/newview/lldrawpoolwater.h +++ b/indra/newview/lldrawpoolwater.h @@ -83,7 +83,7 @@ public: void shade(); void setTransparentTextures(const LLUUID& transparentTextureId, const LLUUID& nextTransparentTextureId); - void setOpaqueTexture(); + void setOpaqueTexture(const LLUUID& opaqueTextureId); void setNormalMaps(const LLUUID& normalMapId, const LLUUID& nextNormalMapId); protected: |