diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-03-20 15:23:42 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-03-20 15:23:42 -0400 |
| commit | cabb6b6a5f339a69fec25b836f46b8b470eebb90 (patch) | |
| tree | 7639aed6cb06bb0d9c3d52cb746d1c98f1120dbe /indra/newview/llvowater.cpp | |
| parent | 739532ee4ffdd58f9d0999901340d5476533fec2 (diff) | |
| parent | 9d9ad9a876d6498a89f9aeefc9bf258e1674dae7 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-release
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); |