summaryrefslogtreecommitdiff
path: root/indra/llrender/llrender.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-12-19 06:00:48 -0800
committerMerov Linden <merov@lindenlab.com>2014-12-19 06:00:48 -0800
commitb0f590f6ab4033503ff9d80e2374e374397d40fb (patch)
tree97e9758c011105b48218cbd2e611c51cc967520d /indra/llrender/llrender.cpp
parentd0d5a6a15cf3c573c89ce590030c7a150b19dd05 (diff)
parent4ec9bce3c2a715f53938e4568c95b7a2bdfc9e16 (diff)
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/llrender/llrender.cpp')
-rwxr-xr-xindra/llrender/llrender.cpp2
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,