diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-09-28 16:55:41 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-09-28 16:55:41 -0500 |
| commit | b8b0886f3e7a421ad5f90cd5454a39f4d2dac959 (patch) | |
| tree | 03616ef6a0f8394a6160cc4d80c33fc8d89d2108 /indra | |
| parent | 872567c0c1a58272b276303c881585acf9ba9ac0 (diff) | |
SH-2507 Fix for linux build
Diffstat (limited to 'indra')
| -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 3b6cc084b1..ddadf07d73 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -51,7 +51,7 @@ using std::string; GLhandleARB LLGLSLShader::sCurBoundShader = 0; LLGLSLShader* LLGLSLShader::sCurBoundShaderPtr = NULL; -S32 LLGLSLShader::sIndexedTextureChannels = NULL; +S32 LLGLSLShader::sIndexedTextureChannels = 0; bool LLGLSLShader::sNoFixedFunction = false; //UI shader -- declared here so llui_libtest will link properly |