diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-04-14 09:34:49 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-04-14 09:34:49 -0700 |
| commit | 82ae214f6a367e17dd335e80e2444cf672108821 (patch) | |
| tree | 5a2ebb115b0674698cfb0d9cbd879add63d88ece /indra/newview/llviewerdisplay.cpp | |
| parent | fe8dec32dbdd6085dd582c49134551638561ca0e (diff) | |
| parent | a49e11efd9e249cc6d3cf5bcffaafe1e831f2fa9 (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 |