diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-11-02 11:46:18 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-11-02 11:46:18 -0500 |
| commit | 55f69de90c9b32c7fa25f16ec7d1f41064eff614 (patch) | |
| tree | 054b0d99490cc6600b3be0e3cb2aaf7918f3fe50 /indra/newview/lldrawpoolalpha.h | |
| parent | 8f47f2222c207938c8fc55158a6fff64ccf1e781 (diff) | |
| parent | 1bea08335b6c2fa31f414db2fe7316a118b2ec18 (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; |