diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-05-30 01:26:27 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-05-30 01:26:27 -0500 |
| commit | 89473b2dc3ecfa8b813268833edddb5b0abd317d (patch) | |
| tree | 0252d59b1ee470ab36b0446da5c4d2e3827fbe1f /indra/llrender/llglslshader.cpp | |
| parent | 8c5fde7ae499a20c5cf2b51f575059dd01693ae8 (diff) | |
| parent | eca17c8993aecfd8d69c1b1765f8ac841ad29119 (diff) | |
merge
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 2e7147a3b4..71d24bcf13 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -56,7 +56,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) +hasGamma(false), hasLighting(false), calculatesAtmospherics(false), disableTextureIndex(false) { } |