diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-14 17:56:55 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-14 17:56:55 -0500 |
| commit | 984feefbecd0338618ea499dc1fa44c5a5fe747d (patch) | |
| tree | 2114f73857009a983ca7b1ce90e2bf36237c57b9 /indra/newview/lldrawpoolalpha.h | |
| parent | 94c137d5c970bc01e3a4dbe8de6a7104085e5ba6 (diff) | |
| parent | baa0ff7d3e34053a1dbc8c5207fe899d9e201ee0 (diff) | |
merge
Diffstat (limited to 'indra/newview/lldrawpoolalpha.h')
| -rw-r--r-- | indra/newview/lldrawpoolalpha.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolalpha.h b/indra/newview/lldrawpoolalpha.h index 12a7ae92b1..a4245e561d 100644 --- a/indra/newview/lldrawpoolalpha.h +++ b/indra/newview/lldrawpoolalpha.h @@ -78,6 +78,7 @@ private: LLGLSLShader* target_shader; LLGLSLShader* simple_shader; LLGLSLShader* fullbright_shader; + LLGLSLShader* emissive_shader; // our 'normal' alpha blend function for this pass LLRender::eBlendFactor mColorSFactor; |