diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-02-11 13:41:31 -0500 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-02-11 13:41:31 -0500 |
| commit | 744381956022c74b8617098ab28b52230dfbd0c2 (patch) | |
| tree | b53aafab1f3067c78bc0564bada8da9bff82a48f /indra/llrender/llglslshader.cpp | |
| parent | 80ee8a8ca3725265636f8052a2442a74a742338f (diff) | |
| parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) | |
Merge. Refresh from viewer-release after 3.7.0 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() |