diff options
author | Dave Parks <davep@lindenlab.com> | 2010-05-01 00:46:50 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2010-05-01 00:46:50 -0500 |
commit | ad8fb0e1bb6c242cc84aa3d2cfaabc9ee36e39b6 (patch) | |
tree | f9a4fe3e89595e9f078d4bcd5a4f37139cfee005 /indra/llrender | |
parent | b0fa1e011f14356b3634f39d32f43e244b6f1298 (diff) | |
parent | f324787a70b8fccc7a8ea202805bf726fba765a7 (diff) |
merge
Diffstat (limited to 'indra/llrender')
-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 949057df04..9256e3959c 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -124,7 +124,7 @@ BOOL LLGLSLShader::createShader(vector<string> * attributes, { GLhandleARB shaderhandle = LLShaderMgr::instance()->loadShaderFile((*fileIter).first, mShaderLevel, (*fileIter).second); LL_DEBUGS("ShaderLoading") << "SHADER FILE: " << (*fileIter).first << " mShaderLevel=" << mShaderLevel << LL_ENDL; - if (mShaderLevel > 0) + if (shaderhandle > 0) { attachObject(shaderhandle); } |