diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-03 13:44:42 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-03 13:44:42 -0500 |
| commit | 90db8ed4687fe28f2e56eba262bc0bb21b2731c2 (patch) | |
| tree | 63759d9d175e6105bb1f8f30b1853b291c84fd72 /indra/llrender/llglslshader.cpp | |
| parent | 043a980d9961492bde95bf6a569a080258810fe9 (diff) | |
| parent | 75aec285349747b09077b576c7ec15838c4132f2 (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) { } |