diff options
author | Merov Linden <merov@lindenlab.com> | 2013-10-14 17:25:24 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-10-14 17:25:24 -0700 |
commit | f6c7b906e1f1d1bcc56a1e71b1867a58c5b2381a (patch) | |
tree | ec9226508d7a3e1555b774fde915a8b299b35cd7 /indra/llrender/llvertexbuffer.h | |
parent | c2f5365f986aab49d5c7cfa2834a68f5b35c09c2 (diff) | |
parent | 04b84ce07dd5bc8364f948ef0004e3dc5328f1b4 (diff) |
Pull merge with lindenlab/viewer-bear
Diffstat (limited to 'indra/llrender/llvertexbuffer.h')
-rwxr-xr-x | indra/llrender/llvertexbuffer.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/llrender/llvertexbuffer.h b/indra/llrender/llvertexbuffer.h index de58207c23..619a0cec46 100755 --- a/indra/llrender/llvertexbuffer.h +++ b/indra/llrender/llvertexbuffer.h @@ -57,8 +57,6 @@ public: static U32 sBytesPooled; static U32 sIndexBytesPooled; - static U32 sCurGLName; - LLVBOPool(U32 vboUsage, U32 vboType); const U32 mUsage; @@ -86,8 +84,6 @@ public: volatile U8* mClientData; }; - std::list<U32> mGLNamePool; - typedef std::list<Record> record_list_t; std::vector<record_list_t> mFreeList; std::vector<U32> mMissCount; |