diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-02-03 17:56:36 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-02-03 17:56:36 -0500 |
| commit | d49e5bcbe26a4b148ce1d20a60d16581f41134c0 (patch) | |
| tree | bd8caf39e789437574119304688ba3c71b7940cf /indra/llrender/llglslshader.cpp | |
| parent | 1e47e5b42d352d5d838eeb96984dbf6497020e32 (diff) | |
| parent | 9d71aae8273fd44dada82b1005c121255dc14dda (diff) | |
automated merge viewer2.0->viewer2.0
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 830617063b..ca92cb6580 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -70,7 +70,7 @@ hasGamma(false), hasLighting(false), calculatesAtmospherics(false) // LLGLSL Shader implementation //=============================== LLGLSLShader::LLGLSLShader() -: mProgramObject(0), mShaderLevel(0), mShaderGroup(SG_DEFAULT) + : mProgramObject(0), mActiveTextureChannels(0), mShaderLevel(0), mShaderGroup(SG_DEFAULT), mUniformsDirty(FALSE) { } |