diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-24 15:32:58 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-24 15:32:58 -0500 |
| commit | e2b52009ea509ec67341df196f3ad629869493e1 (patch) | |
| tree | 65089b4903f6169f46333156d965609735f0a3dd /indra/newview/lldrawpoolalpha.h | |
| parent | 8d410326c937a375fa0eb7855678e590499a79d2 (diff) | |
| parent | 7b83f1dfd1daeb4e0b80e1c369e83137682a723c (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; |