diff options
author | Todd Stinson <stinson@lindenlab.com> | 2012-01-17 10:19:27 -0800 |
---|---|---|
committer | Todd Stinson <stinson@lindenlab.com> | 2012-01-17 10:19:27 -0800 |
commit | 8cf6b9cb929ff37fc6febe1f4ede4efa526260d9 (patch) | |
tree | fb81fc741a515279a4602c1b64abcc7d443cf947 /indra/llrender/llglslshader.cpp | |
parent | fa03d3ee3d9bcf213754250a8180a65156bffe8d (diff) | |
parent | 64c45cbd1ace677456db56d1a506f2fe44b6e9c6 (diff) |
Pull and merge from https://bitbucket.org/lindenlab/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) { } |