diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-01-13 13:46:45 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-01-13 13:46:45 -0500 |
| commit | 6f3cf79a3afa66db229a1c1068e0c01f246f0b79 (patch) | |
| tree | 5eb6e710adc6a0c770f681fabb44fd385dbef977 /indra/llrender | |
| parent | ccd10beb6f8523c401b08d57e916c85d756eb27e (diff) | |
| parent | fad02b30ce61a38007c5cd450cbdd2e09464888d (diff) | |
merge changes for 3.7.24-release
Diffstat (limited to 'indra/llrender')
| -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, |