diff options
author | Graham Linden <graham@lindenlab.com> | 2019-03-13 13:21:48 -0700 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2019-03-13 13:21:48 -0700 |
commit | 898c9f44218353b3bf71b78ffce02662b4927625 (patch) | |
tree | 2793682ba7d69d34730a4aeced04100312a479a2 /indra/llrender/llglslshader.h | |
parent | 868cd32e5e229e503f1b5b1d5ec543fd6f76cb7f (diff) |
Mods to make merge with viewer-release have less whitespace-only change and fix diffs between EEP and VR.
Diffstat (limited to 'indra/llrender/llglslshader.h')
-rw-r--r-- | indra/llrender/llglslshader.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h index 830bad2aef..c1ce3d3aad 100644 --- a/indra/llrender/llglslshader.h +++ b/indra/llrender/llglslshader.h @@ -229,4 +229,5 @@ extern LLGLSLShader gSolidColorProgram; //Alpha mask shader (declared here so llappearance can access properly) extern LLGLSLShader gAlphaMaskProgram; + #endif |