diff options
author | Oz Linden <oz@lindenlab.com> | 2014-12-19 09:14:53 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-12-19 09:14:53 -0500 |
commit | 9c56eb9eadc08aaf939759f4991fc8f201289a13 (patch) | |
tree | 19dbf730addfdaa4cbeba2b5c7491cc1db61c7c6 /indra/llrender/llrender.cpp | |
parent | bf2e3fca73b80afa10a1c913ba752fcaf79ccd19 (diff) | |
parent | 4ec9bce3c2a715f53938e4568c95b7a2bdfc9e16 (diff) |
merge changes for 3.7.23
Diffstat (limited to 'indra/llrender/llrender.cpp')
-rwxr-xr-x | indra/llrender/llrender.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index 388d3a4f1a..0af402efea 100755 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -1168,7 +1168,7 @@ void LLRender::syncMatrices() { stop_glerror(); - U32 name[] = + static const U32 name[] = { LLShaderMgr::MODELVIEW_MATRIX, LLShaderMgr::PROJECTION_MATRIX, |