diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2012-02-06 14:52:11 -0500 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2012-02-06 14:52:11 -0500 |
commit | 041f1c1b03e2eee5d08c2b37883ebf5d5f9671df (patch) | |
tree | 497c21c74f6aec3d2377d801324a6e6a2ea796fe /indra/newview/llvowater.cpp | |
parent | d0da897b24c41983db5a848eced8e71520d85a1b (diff) | |
parent | 54bc900c952b964206d484aa0b92e42238819fc6 (diff) |
merge
Diffstat (limited to 'indra/newview/llvowater.cpp')
-rw-r--r-- | indra/newview/llvowater.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvowater.cpp b/indra/newview/llvowater.cpp index 7df50ec815..315616e8a5 100644 --- a/indra/newview/llvowater.cpp +++ b/indra/newview/llvowater.cpp @@ -167,7 +167,7 @@ BOOL LLVOWater::updateGeometry(LLDrawable *drawable) indices_per_quad * num_quads); LLVertexBuffer* buff = face->getVertexBuffer(); - if (!buff) + if (!buff || !buff->isWriteable()) { buff = new LLVertexBuffer(LLDrawPoolWater::VERTEX_DATA_MASK, GL_DYNAMIC_DRAW_ARB); buff->allocateBuffer(face->getGeomCount(), face->getIndicesCount(), TRUE); |