diff options
| author | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2018-08-16 18:37:45 +0300 |
|---|---|---|
| committer | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2018-08-16 18:37:45 +0300 |
| commit | ac2a2dc67ee8b6855fe0bb44657e491015c93ceb (patch) | |
| tree | be928acff05ba9d05f66a5aabf3c3b2ea47be125 /indra/llrender/llshadermgr.cpp | |
| parent | 8a352faeae571d2ff800770070265f41a33525d9 (diff) | |
| parent | 3237923e10a34d14ac4aac17400811cb1c7c3bdf (diff) | |
Merged lindenlab/viewer-cougar into default
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index e721ad93fa..643c368870 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -537,8 +537,6 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade } } - LL_DEBUGS("ShaderLoading") << "Loading shader file: " << filename << " class " << shader_level << LL_ENDL; - if (filename.empty()) { return 0; @@ -558,7 +556,7 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade fname << getShaderDirPrefix(); fname << gpu_class << "/" << filename; - LL_DEBUGS("ShaderLoading") << "Looking in " << fname.str() << LL_ENDL; + file = LLFile::fopen(fname.str(), "r"); /* Flawfinder: ignore */ if (file) { |