diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-02-26 15:16:02 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-02-26 15:16:02 -0600 |
| commit | eb859ce5c18d4310ae4828d6964b2e8c088ee95f (patch) | |
| tree | c6e0b0a70128acfb16c58c66cde76b69e0acd221 /indra/llrender/llvertexbuffer.h | |
| parent | e82667e3e879d33a2cc94a24cb258a5837c04357 (diff) | |
| parent | f5e5396c3a17b6bcdc4eb49cda304a9047920fe1 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
Diffstat (limited to 'indra/llrender/llvertexbuffer.h')
| -rw-r--r-- | indra/llrender/llvertexbuffer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llrender/llvertexbuffer.h b/indra/llrender/llvertexbuffer.h index 11fa4ab6a0..a3400ae80c 100644 --- a/indra/llrender/llvertexbuffer.h +++ b/indra/llrender/llvertexbuffer.h @@ -125,9 +125,10 @@ public: static LLVBOPool sStreamVBOPool; static LLVBOPool sDynamicVBOPool; + static LLVBOPool sDynamicCopyVBOPool; static LLVBOPool sStreamIBOPool; static LLVBOPool sDynamicIBOPool; - + static std::list<U32> sAvailableVAOName; static U32 sCurVAOName; |