diff options
| author | Kitty Barnett <develop@catznip.com> | 2012-01-23 19:43:14 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2012-01-23 19:43:14 +0100 |
| commit | 7b3bc9b58702940c039db620642c005e054040ed (patch) | |
| tree | f8be20d7d49f7538e3f4daf4564410768c7007b7 /indra/llrender/llglslshader.cpp | |
| parent | b81bf4f6f182e6345889d70140b34b15cbfb8d27 (diff) | |
| parent | 64c45cbd1ace677456db56d1a506f2fe44b6e9c6 (diff) | |
Merge with 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) { } |