diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-04 09:17:26 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-04 09:17:26 +0100 |
| commit | 722c8af1121f3edbcef6c5478c31339177fac802 (patch) | |
| tree | 10eb16a768057a7d175203fa82e6caf0c816492f /indra/llrender/llglslshader.cpp | |
| parent | 29e98032d1ad86686bee0fd58c65f95d1aeba439 (diff) | |
| parent | eb283701afc7ecbe3009a9fb75be1dcb222a383b (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 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); } |