diff options
| author | simon <none@none> | 2014-02-10 16:11:50 -0800 |
|---|---|---|
| committer | simon <none@none> | 2014-02-10 16:11:50 -0800 |
| commit | cb2045fcd5106b5e0028869fc6a3e080d3f8e779 (patch) | |
| tree | 8270c7d248f542107472fff9f2eb10f30721e1ee /indra/llrender/llglslshader.cpp | |
| parent | 8e5da5125de2bc9f8ce5ed2677556953e008c59d (diff) | |
| parent | 4acc2dc2736621952b6ee0e808640dcf79e341c6 (diff) | |
Merge downstream code 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() |