diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-06-15 15:53:45 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-06-15 15:53:45 -0400 |
| commit | 95fc2d48eced78b2aaa29b9e8b3f9410eed1ad8c (patch) | |
| tree | 7748f0142e0ecbc91daa33c42a679799c4375d5e /indra/newview/llviewerdisplay.cpp | |
| parent | 96d16928600dbf3666221a19575af9330840cfd5 (diff) | |
| parent | e0f5ed29daa3b2803aaec60a77bde8df7df292ee (diff) | |
merge changes for 3.7.30-release
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 |