diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-11-13 17:27:12 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-11-13 17:27:12 +0000 |
| commit | 4231714698018b8bd75f3f57df849f81cab05d9c (patch) | |
| tree | 8695606e3038ee5e5d31f2b7c0c8c1a63fc540d8 /indra/llrender | |
| parent | bda785e8b1bef35ecd9d45a7092b0ab66c17d1f4 (diff) | |
| parent | a49e2b604e6b505e083e24b10e39053196d917c1 (diff) | |
Merged in graham_linden/viewer-eep-fixes (pull request #189)
SL-10044 SL-10045
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llglslshader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index 585f8f6504..15a018a0bb 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -864,7 +864,7 @@ BOOL LLGLSLShader::link(BOOL suppress_errors) { BOOL success = LLShaderMgr::instance()->linkProgramObject(mProgramObject, suppress_errors); - if (!suppress_errors) + if (!success && !suppress_errors) { LLShaderMgr::instance()->dumpObjectLog(mProgramObject, !success, mName); } |