diff options
author | Kelly Washington <kelly@lindenlab.com> | 2007-06-21 22:40:22 +0000 |
---|---|---|
committer | Kelly Washington <kelly@lindenlab.com> | 2007-06-21 22:40:22 +0000 |
commit | e03bb0606a10f29c8b94909a713a5bb5c69e88b7 (patch) | |
tree | 6d8d07894579438c8cc70e08f5730c3c95dfe768 /indra/newview/llvowater.h | |
parent | 2638f12f95eea692502836cf6548b4a0b234d009 (diff) |
merge -r62831:64079 branches/maintenance to release
Diffstat (limited to 'indra/newview/llvowater.h')
-rw-r--r-- | indra/newview/llvowater.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llvowater.h b/indra/newview/llvowater.h index fd140fda56..e3df822037 100644 --- a/indra/newview/llvowater.h +++ b/indra/newview/llvowater.h @@ -32,8 +32,7 @@ public: VERTEX_DATA_MASK = (1 << LLVertexBuffer::TYPE_VERTEX) | (1 << LLVertexBuffer::TYPE_NORMAL) | (1 << LLVertexBuffer::TYPE_TEXCOORD) - } - eVertexDataMask; + }; LLVOWater(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp); |