diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-11-08 15:28:13 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-11-08 15:28:13 -0600 |
| commit | 0d568ce9f0522eaa21a12fa5fae31f80c59bd947 (patch) | |
| tree | 6b849a3b48a35feaeff0278ca8e562359df852e2 /indra/newview/llvowater.cpp | |
| parent | 28c26cb491305525fb3f24ec2ef3bcb9b1ab8c5f (diff) | |
| parent | ef8bdb5d95ebd869279ee4bb0510d54e51ab747f (diff) | |
merge
Diffstat (limited to 'indra/newview/llvowater.cpp')
| -rw-r--r-- | indra/newview/llvowater.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvowater.cpp b/indra/newview/llvowater.cpp index e70ac0a2e7..7df50ec815 100644 --- a/indra/newview/llvowater.cpp +++ b/indra/newview/llvowater.cpp @@ -160,7 +160,7 @@ BOOL LLVOWater::updateGeometry(LLDrawable *drawable) static const unsigned int vertices_per_quad = 4; static const unsigned int indices_per_quad = 6; - const S32 size = gSavedSettings.getBOOL("RenderTransparentWater") ? 16 : 1; + const S32 size = gSavedSettings.getBOOL("RenderTransparentWater") && !LLGLSLShader::sNoFixedFunction ? 16 : 1; const S32 num_quads = size * size; face->setSize(vertices_per_quad * num_quads, @@ -231,7 +231,7 @@ BOOL LLVOWater::updateGeometry(LLDrawable *drawable) } } - buff->setBuffer(0); + buff->flush(); mDrawable->movePartition(); LLPipeline::sCompiles++; |