diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-02-08 11:22:52 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-02-08 11:22:52 -0500 |
commit | 635a264e6f76f33a05694c069635653cd19de5d9 (patch) | |
tree | 4e46ca17587c2fe0c75b9749f67486f4d8359bd6 /indra/newview/llvowater.cpp | |
parent | b13fe12fb950f714a2e2fd97708a3baef39ef285 (diff) | |
parent | 289d756ea86bd3898f41592146d8f549cd056846 (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); |