diff options
| author | Jonathan Yap <none@none> | 2014-03-06 09:20:54 -0500 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2014-03-06 09:20:54 -0500 |
| commit | a0f668c0a382ad4bd7a9be703bbcf1edd2bcf460 (patch) | |
| tree | 9da9b08465582432d12797951543a30d6c9fc2c1 /indra/llrender/llglslshader.cpp | |
| parent | 672cc7049777b57a01a61428864ac6e3d10df321 (diff) | |
| parent | a5e56067c28298b4df0ef498303f78f67c35782c (diff) | |
STORM-68 merge
Diffstat (limited to 'indra/llrender/llglslshader.cpp')
| -rwxr-xr-x | indra/llrender/llglslshader.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index 35620bb656..1c50a51d02 100755 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -717,7 +717,14 @@ BOOL LLGLSLShader::mapUniforms(const vector<LLStaticHashedString> * uniforms) BOOL LLGLSLShader::link(BOOL suppress_errors) { - return LLShaderMgr::instance()->linkProgramObject(mProgramObject, suppress_errors); + BOOL success = LLShaderMgr::instance()->linkProgramObject(mProgramObject, suppress_errors); + + if (!suppress_errors) + { + LLShaderMgr::instance()->dumpObjectLog(mProgramObject, !success, mName); + } + + return success; } void LLGLSLShader::bind() |