diff options
author | Oz Linden <oz@lindenlab.com> | 2014-12-19 09:09:20 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-12-19 09:09:20 -0500 |
commit | 1333e9332a074e25178cd28b351bb40998617e10 (patch) | |
tree | c229dd9782a27e3c72d7d99c4a6e15367fb8dbd9 /indra/newview/llspatialpartition.cpp | |
parent | 6a3cb427071641585d9beb44c3e46a148f90a791 (diff) | |
parent | 4ec9bce3c2a715f53938e4568c95b7a2bdfc9e16 (diff) |
merge changes for 3.7.23
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
-rwxr-xr-x | indra/newview/llspatialpartition.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index 0a8257f42b..5e342099d7 100755 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -1632,7 +1632,7 @@ void pushVertsColorCoded(LLSpatialGroup* group, U32 mask) { LLDrawInfo* params = NULL; - LLColor4 colors[] = { + static const LLColor4 colors[] = { LLColor4::green, LLColor4::green1, LLColor4::green2, |