diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2012-01-17 13:37:28 -0500 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2012-01-17 13:37:28 -0500 |
| commit | 0915ce7834f8e36c53e0790c2946b952a12a74c6 (patch) | |
| tree | 270a7d6d12e444d739b85ad9d89e0001621b20a2 /indra/llrender/llglslshader.cpp | |
| parent | 613d0fe42ff94064a7fabeff28845a9406ea9b9c (diff) | |
| parent | 6157386b4c96740e406a49eb9e8f42c6d7f252ff (diff) | |
reconciled .hgtags
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) { } |