diff options
author | Dave Parks <davep@lindenlab.com> | 2011-09-24 23:29:38 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-09-24 23:29:38 -0500 |
commit | f49e7014ca9693d77ff265d3fc668a8b05ddf085 (patch) | |
tree | 96895fe605247d78e6bb3951f61a47e2d744a188 /indra/llui | |
parent | c70026499afccc2730119ae3c7abc7ab971170ea (diff) |
SH-2244 Fix for crash when transparent water disabled (silently ignore setting when basic shaders enabled)
Diffstat (limited to 'indra/llui')
-rw-r--r-- | indra/llui/llui.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp index 212672b809..36f87fc597 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -534,7 +534,7 @@ void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 width, S32 height, LLTex } } - gGL.getTexUnit(0)->bind(image); + gGL.getTexUnit(0)->bind(image, true); gGL.color4fv(color.mV); @@ -732,7 +732,7 @@ void gl_draw_scaled_rotated_image(S32 x, S32 y, S32 width, S32 height, F32 degre LLGLSUIDefault gls_ui; - gGL.getTexUnit(0)->bind(image); + gGL.getTexUnit(0)->bind(image, true); gGL.color4fv(color.mV); @@ -785,7 +785,7 @@ void gl_draw_scaled_rotated_image(S32 x, S32 y, S32 width, S32 height, F32 degre LLMatrix3 quat(0.f, 0.f, degrees*DEG_TO_RAD); - gGL.getTexUnit(0)->bind(image); + gGL.getTexUnit(0)->bind(image, true); gGL.color4fv(color.mV); |