diff options
| author | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2016-05-24 18:37:20 +0300 |
|---|---|---|
| committer | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2016-05-24 18:37:20 +0300 |
| commit | 4d9b3cd725e053e10016a39313080c9c6c6a71c7 (patch) | |
| tree | a96f24fa3ab0ba0a787a49361619570e5e68ec62 /indra/llrender/llshadermgr.cpp | |
| parent | addbfaf1c774011f3e55a1106f0b83153b7b8568 (diff) | |
| parent | c2ef3b4c7186dbbd95b16520f281b7d58364fb52 (diff) | |
Merge VOB with release 4.0.6
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; } } |