diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-02-02 14:26:33 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-02-02 14:26:33 -0500 |
| commit | 5b2dbbadf70ee33bfd288b6384ae0d51715488b1 (patch) | |
| tree | 48d7678fbbca7359db17b472e3233c1d2874828b /indra/llrender/llglslshader.cpp | |
| parent | 03290257345c22f909cf1cfac3981e7e07820d21 (diff) | |
| parent | 34408bed2644ff957502454f05c21c31fec90009 (diff) | |
merge changes for latest viewer-development
Diffstat (limited to 'indra/llrender/llglslshader.cpp')
| -rw-r--r-- | indra/llrender/llglslshader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index 5a6f3d8292..6b2852670a 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -66,7 +66,7 @@ BOOL shouldChange(const LLVector4& v1, const LLVector4& v2) LLShaderFeatures::LLShaderFeatures() : calculatesLighting(false), isShiny(false), isFullbright(false), hasWaterFog(false), hasTransport(false), hasSkinning(false), hasObjectSkinning(false), hasAtmospherics(false), isSpecular(false), -hasGamma(false), hasLighting(false), calculatesAtmospherics(false), mIndexedTextureChannels(0), disableTextureIndex(false), +hasGamma(false), hasLighting(false), isAlphaLighting(false), calculatesAtmospherics(false), mIndexedTextureChannels(0), disableTextureIndex(false), hasAlphaMask(false) { } |