diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-05-20 02:06:08 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-05-20 02:06:08 +0300 |
| commit | c50f96b49215b4279192ffc3eb336a3465a00756 (patch) | |
| tree | da923846a177ea97882dd0ba07b9235a5f0e7b8b /indra/llrender/llshadermgr.cpp | |
| parent | d3de134da047460c68ffd7cc732e592049a1e83d (diff) | |
| parent | b25a22a2c113a1e95f2cd5d45bb5b80a756c4a80 (diff) | |
Merged in lindenlab/viewer-lynx
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
| -rw-r--r--[-rwxr-xr-x] | indra/llrender/llshadermgr.cpp | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index b2be3cc3b6..b297223c2e 100755..100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -515,29 +515,13 @@ void LLShaderMgr::dumpObjectLog(GLhandleARB ret, BOOL warns, const std::string& if (log.length() > 0 || warns) { + LL_DEBUGS("ShaderLoading") << "Shader loading "; + if (!filename.empty()) { - if (warns) - { - LL_WARNS("ShaderLoading") << "From " << filename << ":" << LL_ENDL; - } - else - { - LL_INFOS("ShaderLoading") << "From " << filename << ":" << LL_ENDL; - } - } - } - - if ( log.length() > 0 ) - { - if (warns) - { - LL_WARNS("ShaderLoading") << log << LL_ENDL; - } - else - { - LL_INFOS("ShaderLoading") << log << LL_ENDL; - } + LL_CONT << "From " << filename << ":\n"; + } + LL_CONT << log << LL_ENDL; } } |