diff options
| author | obscurestar <none@none> | 2014-02-24 15:12:04 -0800 |
|---|---|---|
| committer | obscurestar <none@none> | 2014-02-24 15:12:04 -0800 |
| commit | 8fd270af1cb7ee2cad7c47909b308ef31caf4cd3 (patch) | |
| tree | 0908629d1ae5173098bb204ab2447c6d351d894e /indra/llrender/llglslshader.cpp | |
| parent | 57d7cbb8375ca59bcb3d3643e4013b88e8883822 (diff) | |
| parent | de8fea13627cc5978b8a6135802a52864a11c39a (diff) | |
Pulled from 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() |