diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-02-05 10:10:27 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-02-05 10:10:27 -0800 |
| commit | 3c9daac7afeeb31d2feabde59183a2e005a30d7f (patch) | |
| tree | 62c58ae3478f4763660687a59ca77491a604e1fa /indra/llrender/llglslshader.cpp | |
| parent | e00082c644d201291a4f9243f915fc09c320eaa7 (diff) | |
| parent | fed6c9eb0fa58559c13729b65ecee181f58f3c69 (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 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) { } |