diff options
author | Oz Linden <oz@lindenlab.com> | 2018-05-31 17:35:35 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2018-05-31 17:35:35 -0400 |
commit | c0e00cc61750d2b1bba3ada6622023df4725b1a4 (patch) | |
tree | f0cc704c8af726f27164cb569cc77e6f55e533d2 /indra/llrender/llvertexbuffer.h | |
parent | e56be73dc646d414c7a10621ac489add6762267b (diff) | |
parent | 40d4e8b2e6d25a625c7a5ef5dd3e94321d18ce82 (diff) |
merge changes for 5.1.5-release
Diffstat (limited to 'indra/llrender/llvertexbuffer.h')
-rw-r--r-- | indra/llrender/llvertexbuffer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llvertexbuffer.h b/indra/llrender/llvertexbuffer.h index bd27296eb6..c89d7e3958 100644 --- a/indra/llrender/llvertexbuffer.h +++ b/indra/llrender/llvertexbuffer.h @@ -341,8 +341,8 @@ public: static bool sDisableVBOMapping; //disable glMapBufferARB static bool sEnableVBOs; - static S32 sTypeSize[TYPE_MAX]; - static U32 sGLMode[LLRender::NUM_MODES]; + static const S32 sTypeSize[TYPE_MAX]; + static const U32 sGLMode[LLRender::NUM_MODES]; static U32 sGLRenderBuffer; static U32 sGLRenderArray; static U32 sGLRenderIndices; |