diff options
| author | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-02-21 16:50:04 -0800 |
|---|---|---|
| committer | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-02-21 16:50:04 -0800 |
| commit | 2fd0e6e8f9cea68fbfe77282d623e70c64b52469 (patch) | |
| tree | 58209b1da794413be879b10e7444ced701f5adf1 /indra/newview/lldrawpoolavatar.h | |
| parent | 69133ca4e318fc93fed39589c9221251440bcb96 (diff) | |
Merge viewer-cat and resolve conflict with alternate self
Diffstat (limited to 'indra/newview/lldrawpoolavatar.h')
| -rw-r--r-- | indra/newview/lldrawpoolavatar.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolavatar.h b/indra/newview/lldrawpoolavatar.h index 5551d8f6d8..544969001d 100644 --- a/indra/newview/lldrawpoolavatar.h +++ b/indra/newview/lldrawpoolavatar.h @@ -209,6 +209,7 @@ public: static BOOL sSkipOpaque; static BOOL sSkipTransparent; static S32 sDiffuseChannel; + static F32 sMinimumAlpha; static LLGLSLShader* sVertexProgram; }; |