diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-12-06 11:30:27 -0500 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-12-06 11:30:27 -0500 |
| commit | 97a92deb18d09e030c0800107204d9776a3c6229 (patch) | |
| tree | 16133351b0822937c5da1e7009e80e3157119d59 /indra/newview/lldrawpoolalpha.h | |
| parent | ae2a1ea9f10dc9bf3cc5ef59f1428ea1e5fa6495 (diff) | |
| parent | 95850eddfd26e85dcfa1dd6f71233b6e0bf08253 (diff) | |
reconciled .hgtags
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; |