diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-02-13 16:16:24 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-02-13 16:16:24 -0800 |
| commit | 95f859dc22724611f4a1d2dc91e0c1769ec1e632 (patch) | |
| tree | 3083719871df0fa6627b7a30514bfef3ad5de816 /indra/llrender/llglslshader.cpp | |
| parent | c5fff11a76613b366216bcd262dfddfd0cc2a6a3 (diff) | |
| parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) | |
Merge with viewer-release
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() |