diff options
author | nat_linden <nat@lindenlab.com> | 2015-04-15 10:50:46 -0400 |
---|---|---|
committer | nat_linden <nat@lindenlab.com> | 2015-04-15 10:50:46 -0400 |
commit | 75396e1f131137d7f0dfb3f5fdbddeea1ce12fba (patch) | |
tree | 33ca8281a889107816663e2bacfc44cfeeb9e815 /indra/newview/llviewerdisplay.cpp | |
parent | e59dbf1b23a13c6a7f1f0d9661d3dcb78ea040f2 (diff) | |
parent | e611e35e033e99f619b0e4938f6879c8e387efd5 (diff) |
Merged lindenlab/viewer-tools-update into default
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
-rwxr-xr-x | indra/newview/llviewerdisplay.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index cd9b2ed11b..afa00e3e6e 100755 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -930,8 +930,8 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) if (gSavedSettings.getBOOL("RenderDepthPrePass") && LLGLSLShader::sNoFixedFunction) { gGL.setColorMask(false, false); - - U32 types[] = { + + static const U32 types[] = { LLRenderPass::PASS_SIMPLE, LLRenderPass::PASS_FULLBRIGHT, LLRenderPass::PASS_SHINY |